From 27efbbafb2201ec9d5d83ca44e39a0f1f911c110 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 12 Apr 2004 01:02:11 -0700 Subject: [PATCH] ext2fs sb= mount option fix From: (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. --- fs/ext2/super.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 6ab37ccf95ba..3a06830a55fc 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -564,8 +564,9 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 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; + unsigned long 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 +599,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 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))) { -- cgit v1.2.3