patch-2.3.34 linux/fs/minix/inode.c

• Lines: 38
• Date: Mon Dec 20 15:07:08 1999
• Orig file: v2.3.33/linux/fs/minix/inode.c
• Orig date: Tue Aug 31 17:29:14 1999

diff -u --recursive --new-file v2.3.33/linux/fs/minix/inode.c linux/fs/minix/inode.c
@@ -177,6 +177,7 @@
 	kdev_t dev = s->s_dev;
 	const char * errmsg;
 	struct inode *root_inode;
+	unsigned int hblock;
 	
 	/* N.B. These should be compile-time tests.
 	   Unfortunately that is impossible. */
@@ -186,6 +187,11 @@
 		panic("bad V2 i-node size");
 
 	MOD_INC_USE_COUNT;
+
+	hblock = get_hardblocksize(dev);
+	if (hblock && hblock > BLOCK_SIZE)
+		goto out_bad_hblock;
+
 	lock_super(s);
 	set_blocksize(dev, BLOCK_SIZE);
 	if (!(bh = bread(dev,1,BLOCK_SIZE)))
@@ -322,11 +328,16 @@
 	brelse(bh);
 	goto out_unlock;
 
+out_bad_hblock:
+	printk("MINIX-fs: blocksize too small for device.\n");
+	goto out;
+
 out_bad_sb:
 	printk("MINIX-fs: unable to read superblock\n");
     out_unlock:
-	s->s_dev = 0;
 	unlock_super(s);
+ out:
+	s->s_dev = 0;
 	MOD_DEC_USE_COUNT;
 	return NULL;
 }