1 files changed, 306 insertions, 132 deletions

diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 87c7c1270..403a278c9 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -31,6 +31,9 @@
  *
  * 03.01.94  -	Added support for file system valid flag.
  *		(Dr. Wettstein, greg%wind.uucp@plains.nodak.edu)
+ *
+ * 30.10.94 - added support for v2 filesystem
+ *	      (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de)
  * 
  * 09.11.94  -	Added test to prevent overwrite of mounted fs adapted
  *		from Theodore Ts'o's (tytso@athena.mit.edu) mke2fs
@@ -40,13 +43,16 @@
  *		the filesystem is not misidentified as a MS-DOS FAT filesystem.
  *		(Daniel Quinlan, quinlan@yggdrasil.com)
  *
- * Usage:  mkfs [-c] [-nXX] [-iXX] device size-in-blocks
- *         mkfs [-l filename ] device size-in-blocks
+ * 02.07.96  -  Added small patch from Russell King to make the program a
+ *		good deal more portable (janl@math.uio.no)
+ *
+ * Usage:  mkfs [-c | -l filename ] [-v] [-nXX] [-iXX] device [size-in-blocks]
  *
  *	-c for readablility checking (SLOW!)
  *      -l for getting a list of bad blocks from a file.
  *	-n for namelength (currently the kernel only uses 14 or 30)
  *	-i for number of inodes
+ *	-v for v2 filesystem
  *
  * The device may be a block device or a image of one, but this isn't
  * enforced (but it's not much fun on a character device :-). 
@@ -62,11 +68,16 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <sys/stat.h>
+#include <sys/ioctl.h>
 #include <mntent.h>
 
 #include <linux/fs.h>
 #include <linux/minix_fs.h>
 
+#ifdef MINIX2_SUPER_MAGIC2
+#define HAVE_MINIX2 1
+#endif
+
 #ifndef __GNUC__
 #error "needs gcc for the bitop-__asm__'s"
 #endif
@@ -83,7 +94,13 @@
 
 #define UPPER(size,n) ((size+((n)-1))/(n))
 #define INODE_SIZE (sizeof(struct minix_inode))
-#define INODE_BLOCKS UPPER(INODES,MINIX_INODES_PER_BLOCK)
+#ifdef HAVE_MINIX2
+#define INODE_SIZE2 (sizeof(struct minix2_inode))
+#define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
+				    : MINIX_INODES_PER_BLOCK))
+#else
+#define INODE_BLOCKS UPPER(INODES, (MINIX_INODES_PER_BLOCK))
+#endif
 #define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
 
 #define BITS_PER_BLOCK (BLOCK_SIZE<<3)
@@ -96,18 +113,26 @@ static int check = 0;
 static int badblocks = 0;
 static int namelen = 30;	/* default (changed to 30, per Linus's
 				   suggestion, Sun Nov 21 08:05:07 1993) */
-static int dirsize = 16;
-static int magic = MINIX_SUPER_MAGIC;
+static int dirsize = 32;
+static int magic = MINIX_SUPER_MAGIC2;
+static int version2 = 0;
 
 static char root_block[BLOCK_SIZE] = "\0";
 
 static char * inode_buffer = NULL;
 #define Inode (((struct minix_inode *) inode_buffer)-1)
+#ifdef HAVE_MINIX2
+#define Inode2 (((struct minix2_inode *) inode_buffer)-1)
+#endif
 static char super_block_buffer[BLOCK_SIZE];
 static char boot_block_buffer[512];
 #define Super (*(struct minix_super_block *)super_block_buffer)
 #define INODES ((unsigned long)Super.s_ninodes)
-#define ZONES ((unsigned long)Super.s_nzones)
+#ifdef HAVE_MINIX2
+#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
+#else
+#define ZONES ((unsigned long)(Super.s_nzones))
+#endif
 #define IMAPS ((unsigned long)Super.s_imap_blocks)
 #define ZMAPS ((unsigned long)Super.s_zmap_blocks)
 #define FIRSTZONE ((unsigned long)Super.s_firstdatazone)
@@ -123,19 +148,7 @@ static unsigned short good_blocks_table[MAX_GOOD_BLOCKS];
 static int used_good_blocks = 0;
 static unsigned long req_nr_inodes = 0;
 
-#define bitop(name,op) \
-static inline int name(char * addr,unsigned int nr) \
-{ \
-int __res; \
-__asm__ __volatile__("bt" op " %1,%2; adcl $0,%0" \
-:"=g" (__res) \
-:"r" (nr),"m" (*(addr)),"0" (0)); \
-return __res; \
-}
-
-bitop(bit,"")
-bitop(setbit,"s")
-bitop(clrbit,"r")
+#include "bitops.h"
 
 #define inode_in_use(x) (bit(inode_map,(x)))
 #define zone_in_use(x) (bit(zone_map,(x)-FIRSTZONE+1))
@@ -157,7 +170,7 @@ volatile void fatal_error(const char * fmt_string,int status)
 	exit(status);
 }
 
-#define usage() fatal_error("Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name blocks\n",16)
+#define usage() fatal_error("Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n",16)
 #define die(str) fatal_error("%s: " str "\n",8)
 
 /*
@@ -182,6 +195,57 @@ static void check_mount(void)
 	die("%s is mounted; will not make a filesystem here!");
 }
 
+static long valid_offset (int fd, int offset)
+{
+	char ch;
+
+	if (lseek (fd, offset, 0) < 0)
+		return 0;
+	if (read (fd, &ch, 1) < 1)
+		return 0;
+	return 1;
+}
+
+static int count_blocks (int fd)
+{
+	int high, low;
+
+	low = 0;
+	for (high = 1; valid_offset (fd, high); high *= 2)
+		low = high;
+	while (low < high - 1)
+	{
+		const int mid = (low + high) / 2;
+
+		if (valid_offset (fd, mid))
+			low = mid;
+		else
+			high = mid;
+	}
+	valid_offset (fd, 0);
+	return (low + 1);
+}
+
+static int get_size(const char  *file)
+{
+	int	fd;
+	int	size;
+
+	fd = open(file, O_RDWR);
+	if (fd < 0) {
+		perror(file);
+		exit(1);
+	}
+	if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
+		close(fd);
+		return (size * 512);
+	}
+		
+	size = count_blocks(fd);
+	close(fd);
+	return size;
+}
+
 void write_tables(void)
 {
 	/* Mark the super block valid. */
@@ -300,6 +364,58 @@ end_bad:
 		write_block(dind, (char *) dind_block);
 }
 
+#ifdef HAVE_MINIX2
+void
+make_bad_inode2 (void)
+{
+	struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
+	int i, j, zone;
+	int ind = 0, dind = 0;
+	unsigned long ind_block[BLOCK_SIZE >> 2];
+	unsigned long dind_block[BLOCK_SIZE >> 2];
+
+	if (!badblocks)
+		return;
+	mark_inode (MINIX_BAD_INO);
+	inode->i_nlinks = 1;
+	inode->i_atime = inode->i_mtime = inode->i_ctime = time (NULL);
+	inode->i_mode = S_IFREG + 0000;
+	inode->i_size = badblocks * BLOCK_SIZE;
+	zone = next (0);
+	for (i = 0; i < 7; i++) {
+		inode->i_zone[i] = zone;
+		if (!NEXT_BAD)
+			goto end_bad;
+	}
+	inode->i_zone[7] = ind = get_free_block ();
+	memset (ind_block, 0, BLOCK_SIZE);
+	for (i = 0; i < 256; i++) {
+		ind_block[i] = zone;
+		if (!NEXT_BAD)
+			goto end_bad;
+	}
+	inode->i_zone[8] = dind = get_free_block ();
+	memset (dind_block, 0, BLOCK_SIZE);
+	for (i = 0; i < 256; i++) {
+		write_block (ind, (char *) ind_block);
+		dind_block[i] = ind = get_free_block ();
+		memset (ind_block, 0, BLOCK_SIZE);
+		for (j = 0; j < 256; j++) {
+			ind_block[j] = zone;
+			if (!NEXT_BAD)
+				goto end_bad;
+		}
+	}
+	/* Could make triple indirect block here */
+	die ("too many bad blocks");
+ end_bad:
+	if (ind)
+		write_block (ind, (char *) ind_block);
+	if (dind)
+		write_block (dind, (char *) dind_block);
+}
+#endif
+
 void make_root_inode(void)
 {
 	struct minix_inode * inode = &Inode[MINIX_ROOT_INO];
@@ -319,9 +435,32 @@ void make_root_inode(void)
 	write_block(inode->i_zone[0],root_block);
 }
 
+#ifdef HAVE_MINIX2
+void
+make_root_inode2 (void)
+{
+	struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
+
+	mark_inode (MINIX_ROOT_INO);
+	inode->i_zone[0] = get_free_block ();
+	inode->i_nlinks = 2;
+	inode->i_atime = inode->i_mtime = inode->i_ctime = time (NULL);
+	if (badblocks)
+		inode->i_size = 3 * dirsize;
+	else {
+		root_block[2 * dirsize] = '\0';
+		root_block[2 * dirsize + 1] = '\0';
+		inode->i_size = 2 * dirsize;
+	}
+	inode->i_mode = S_IFDIR + 0755;
+	write_block (inode->i_zone[0], root_block);
+}
+#endif
+
 void setup_tables(void)
 {
 	int i;
+	unsigned long inodes;
 
 	memset(inode_map,0xff,sizeof(inode_map));
 	memset(zone_map,0xff,sizeof(zone_map));
@@ -329,13 +468,16 @@ void setup_tables(void)
 	memset(boot_block_buffer,0,512);
 	MAGIC = magic;
 	ZONESIZE = 0;
-	MAXSIZE = (7+512+512*512)*1024;
+	MAXSIZE = version2 ? 0x7fffffff : (7+512+512*512)*1024;
 	ZONES = BLOCKS;
 /* some magic nrs: 1 inode / 3 blocks */
 	if ( req_nr_inodes == 0 ) 
-		INODES = BLOCKS/3;
+		inodes = BLOCKS/3;
 	else
-		INODES = req_nr_inodes;
+		inodes = req_nr_inodes;
+	if (inodes > 65535)
+		inodes = 65535;
+	INODES = inodes;
 /* I don't want some off-by-one errors, so this hack... */
 	if ((INODES & 8191) > 8188)
 		INODES -= 5;
@@ -345,6 +487,8 @@ void setup_tables(void)
 	ZMAPS = 0;
 	while (ZMAPS != UPPER(BLOCKS - NORM_FIRSTZONE,BITS_PER_BLOCK))
 		ZMAPS = UPPER(BLOCKS - NORM_FIRSTZONE,BITS_PER_BLOCK);
+	if (ZMAPS > 64)
+		die ("Filesystem too big for Linux to handle");
 	FIRSTZONE = NORM_FIRSTZONE;
 	for (i = FIRSTZONE ; i<ZONES ; i++)
 		unmark_zone(i);
@@ -354,11 +498,11 @@ void setup_tables(void)
 	if (!inode_buffer)
 		die("unable to allocate buffer for inodes");
 	memset(inode_buffer,0,INODE_BUFFER_SIZE);
-	printf("%d inodes\n",INODES);
-	printf("%d blocks\n",ZONES);
-	printf("Firstdatazone=%d (%d)\n",FIRSTZONE,NORM_FIRSTZONE);
+	printf("%ld inodes\n",INODES);
+	printf("%ld blocks\n",ZONES);
+	printf("Firstdatazone=%ld (%ld)\n",FIRSTZONE,NORM_FIRSTZONE);
 	printf("Zonesize=%d\n",BLOCK_SIZE<<ZONESIZE);
-	printf("Maxsize=%d\n\n",MAXSIZE);
+	printf("Maxsize=%ld\n\n",MAXSIZE);
 }
 
 /*
@@ -431,116 +575,146 @@ void check_blocks(void)
 
 void get_list_blocks(filename)
 char *filename;
-{
-	FILE *listfile;
-	unsigned long blockno;
 
-	listfile=fopen(filename,"r");
-	if(listfile == (FILE *)NULL) {
-		die("can't open file of bad blocks");
-	}
-	while(!feof(listfile)) {
-		fscanf(listfile,"%d\n", &blockno);
-		mark_zone(blockno);
-		badblocks++;
-	}
-	if(badblocks) {
-		printf("%d bad block%s\n", badblocks, (badblocks>1)?"s":"");
-	}
+{
+  FILE *listfile;
+  unsigned long blockno;
+
+  listfile=fopen(filename,"r");
+  if(listfile == (FILE *)NULL) {
+    die("can't open file of bad blocks");
+  }
+  while(!feof(listfile)) {
+    fscanf(listfile,"%ld\n", &blockno);
+    mark_zone(blockno);
+    badblocks++;
+  }
+  if(badblocks) {
+    printf("%d bad block%s\n", badblocks, (badblocks>1)?"s":"");
+  }
 }
 
 int main(int argc, char ** argv)
+
 {
-	int i;
-	char * tmp;
-	struct stat statbuf;
-	char * listfile = NULL;
-
-	if (argc && *argv)
-		program_name = *argv;
-	if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
-		die("bad inode size");
-	while (argc-- > 1) {
-		argv++;
-		if (argv[0][0] != '-')
-			if (device_name) {
-				BLOCKS = strtol(argv[0],&tmp,0);
-				if (*tmp) {
-					printf("strtol error: number of"
-					       " blocks not specified");
-					usage();
-				}
-			} else
-				device_name = argv[0];
-		else { 
-			if(argv[0][1] == 'l') {
-				listfile = argv[1];
-				argv++;
-				if (!(argc--))
-					usage();
-			} else {
-				if(argv[0][1] == 'i') {
-					req_nr_inodes
-					      = (unsigned long)atol(argv[1]);
-					argv++;
-					if (!(argc--))
-						usage();
-				} else while (*(++argv[0])) {
-					switch (argv[0][0]) {
-						case 'c': check=1; break;
-						case 'n':
-							i = strtoul(argv[0]+1,&tmp,0);
-							if (*tmp)
-								usage();
-							argv[0][1] = '\0';
-							if (i == 14)
-								magic = MINIX_SUPER_MAGIC;
-							else if (i == 30)
-								magic = MINIX_SUPER_MAGIC2;
-							else
-								usage();
-							namelen = i;
-							dirsize = i+2;
-							break;
-						default: usage();
-					}
-				}
-			}
-		}
+  int i;
+  char * tmp;
+  struct stat statbuf;
+  char * listfile = NULL;
+
+  if (argc && *argv)
+    program_name = *argv;
+  if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
+    die("bad inode size");
+#ifdef HAVE_MINIX2
+  if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
+    die("bad inode size");
+#endif
+  while (argc-- > 1) {
+    argv++;
+    if (argv[0][0] != '-')
+      if (device_name) {
+	BLOCKS = strtol(argv[0],&tmp,0);
+	if (*tmp) {
+	  printf("strtol error: number of"
+		 " blocks not specified");
+	  usage();
 	}
-	if (!device_name || BLOCKS<10 || BLOCKS > 65536) {
-		usage();
+      } else
+	device_name = argv[0];
+    else { 
+      if(argv[0][1] == 'l') {
+	listfile = argv[1];
+	argv++;
+	if (!(argc--))
+	  usage();
+      } else {
+	if(argv[0][1] == 'i') {
+	  req_nr_inodes
+	    = (unsigned long)atol(argv[1]);
+	  argv++;
+	  if (!(argc--))
+	    usage();
+	} else while (*(++argv[0])) {
+	  switch (argv[0][0]) {
+	  case 'c': check=1; break;
+	  case 'n':
+	    i = strtoul(argv[0]+1,&tmp,0);
+	    if (*tmp)
+	      usage();
+	    argv[0][1] = '\0';
+	    if (i == 14)
+	      magic = MINIX_SUPER_MAGIC;
+	    else if (i == 30)
+	      magic = MINIX_SUPER_MAGIC2;
+	    else
+	      usage();
+	    namelen = i;
+	    dirsize = i+2;
+	    break;
+	  case 'v':
+#ifdef HAVE_MINIX2
+	    version2 = 1;
+#else
+	    fatal_error("%s: not compiled with minix v2 support\n",-1);
+#endif
+	    break;
+	  default: usage();
+	  }
 	}
-	check_mount();		/* is it already mounted? */
-	tmp = root_block;
-	tmp[0] = 1;
-	tmp[1] = 0;
-	strcpy(tmp+2,".");
-	tmp += dirsize;
-	tmp[0] = 1;
-	tmp[1] = 0;
-	strcpy(tmp+2,"..");
-	tmp += dirsize;
-	tmp[0] = 2;
-	tmp[1] = 0;
-	strcpy(tmp+2,".badblocks");
-	DEV = open(device_name,O_RDWR );
-	if (DEV<0)
-		die("unable to open %s");
-	if (fstat(DEV,&statbuf)<0)
-		die("unable to stat %s");
-	if (!S_ISBLK(statbuf.st_mode))
-		check=0;
-	else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
-		die("will not try to make filesystem on '%s'");
-	setup_tables();
-	if (check)
-		check_blocks();
-        else if (listfile)
-                get_list_blocks(listfile);
-	make_root_inode();
-	make_bad_inode();
-	mark_good_blocks();
-	write_tables();
-	return 0;
+      }
+    }
+  }
+  if (device_name && !BLOCKS)
+    BLOCKS = get_size (device_name) / 1024;
+  if (!device_name || BLOCKS<10) {
+    usage();
+  }
+#ifdef HAVE_MINIX2
+  if (version2) {
+    if (namelen == 14)
+      magic = MINIX2_SUPER_MAGIC;
+    else
+      magic = MINIX2_SUPER_MAGIC2;
+  } else
+#endif
+    if (BLOCKS > 65535)
+      BLOCKS = 65535;
+  check_mount();		/* is it already mounted? */
+  tmp = root_block;
+  *(short *)tmp = 1;
+  strcpy(tmp+2,".");
+  tmp += dirsize;
+  *(short *)tmp = 1;
+  strcpy(tmp+2,"..");
+  tmp += dirsize;
+  *(short *)tmp = 2;
+  strcpy(tmp+2,".badblocks");
+  DEV = open(device_name,O_RDWR );
+  if (DEV<0)
+    die("unable to open %s");
+  if (fstat(DEV,&statbuf)<0)
+    die("unable to stat %s");
+  if (!S_ISBLK(statbuf.st_mode))
+    check=0;
+  else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
+    die("will not try to make filesystem on '%s'");
+  setup_tables();
+  if (check)
+    check_blocks();
+  else if (listfile)
+    get_list_blocks(listfile);
+#ifdef HAVE_MINIX2
+  if (version2) {
+    make_root_inode2 ();
+    make_bad_inode2 ();
+  } else
+#endif
+    {
+      make_root_inode();
+      make_bad_inode();
+    }
+  mark_good_blocks();
+  write_tables();
+  return 0;
 }