aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2008-02-06 04:37:42 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:08 -0500
commita8e3eff4668e3a4d6dbe7985a780f91de38a3c71 (patch)
treec1844764ea2d3486767e8359436b255756883ea0 /fs
parentcce992bcee3e1cf917956c2190d86f2e591636a9 (diff)
ext2: xip check fix
ext2 should not worry about checking sb->s_blocksize for XIP before the sb's blocksize actually gets set. Signed-off-by: Nick Piggin <npiggin@suse.de> Acked-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext2/super.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 0ff8913f9016..75af3fbe8384 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -868,8 +868,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
868 868
869 blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size); 869 blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size);
870 870
871 if ((ext2_use_xip(sb)) && ((blocksize != PAGE_SIZE) || 871 if (ext2_use_xip(sb) && blocksize != PAGE_SIZE) {
872 (sb->s_blocksize != blocksize))) {
873 if (!silent) 872 if (!silent)
874 printk("XIP: Unsupported blocksize\n"); 873 printk("XIP: Unsupported blocksize\n");
875 goto failed_mount; 874 goto failed_mount;