[PATCH] ext2fs sb= mount option fix (kernel 2.6.5)

[PATCH] ext2fs sb= mount option fix (kernel 2.6.5)

[Andrew Church]

     The following patch fixes a bug in the processing of the sb=
(alternate superblock) mount option for ext2: when changing the device
block size, the given superblock is ignored and the code reverts to using
block 1.  This patch is against kernel 2.6.5.

  --Andrew Church
    achurch@achurch.org
    http://achurch.org/

---------------------------------------------------------------------------

--- fs/ext2/super.c.old	Thu Mar 11 11:55:35 2004
+++ fs/ext2/super.c	Mon Apr  5 09:15:54 2004
@@ -564,8 +564,8 @@
 	struct ext2_sb_info * sbi;
 	struct ext2_super_block * es;
 	struct inode *root;
-	unsigned long block, sb_block = 1;
-	unsigned long logic_sb_block = get_sb_block(&data);
+	unsigned long block, sb_block = get_sb_block(&data);
+	unsigned long logic_sb_block;
 	unsigned long offset = 0;
 	unsigned long def_mount_opts;
 	int blocksize = BLOCK_SIZE;
@@ -598,6 +598,8 @@
 	if (blocksize != BLOCK_SIZE) {
 		logic_sb_block = (sb_block*BLOCK_SIZE) / blocksize;
 		offset = (sb_block*BLOCK_SIZE) % blocksize;
+	} else {
+		logic_sb_block = sb_block;
 	}
 
 	if (!(bh = sb_bread(sb, logic_sb_block))) {