Imported reiserfsprogs-3.6.18

mkreiserfs/mkreiserfs.c

@@ -13,29 +13,22 @@
 
 #define _GNU_SOURCE
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <asm/types.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/vfs.h>
-#include <time.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <linux/kdev_t.h>
-#include <sys/utsname.h>
-#include <getopt.h>
-#include <stdarg.h>
+#ifndef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include "io.h"
 #include "misc.h"
 #include "reiserfs_lib.h"
-#include "../include/config.h"
+
 #include "../version.h"
 
+#include <getopt.h>
+#include <stdarg.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/utsname.h>
+
 #if defined(HAVE_LIBUUID) && defined(HAVE_UUID_UUID_H)
 #  include <uuid/uuid.h>
 #endif
@@ -511,13 +504,8 @@ static int select_format (void)
 	}
 	
 	reiserfs_warning(stdout, "Kernel %s is running.\n", sysinfo.release);
-	if (!strncmp (sysinfo.release, "2.6", 3))
-		return REISERFS_FORMAT_3_6;
 	
-	if (!strncmp (sysinfo.release, "2.5", 3))
-		return REISERFS_FORMAT_3_6;
-	
-	if (!strncmp (sysinfo.release, "2.4", 3))
+	if (strncmp (sysinfo.release, "2.4", 3) >= 0)
 		return REISERFS_FORMAT_3_6;
 
 	if (strncmp (sysinfo.release, "2.2", 3)) {