diff --git a/[refs] b/[refs] index 7418eb85b4db..b14ac670915c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cce992bcee3e1cf917956c2190d86f2e591636a9 +refs/heads/master: a8e3eff4668e3a4d6dbe7985a780f91de38a3c71 diff --git a/trunk/fs/ext2/super.c b/trunk/fs/ext2/super.c index 0ff8913f9016..75af3fbe8384 100644 --- a/trunk/fs/ext2/super.c +++ b/trunk/fs/ext2/super.c @@ -868,8 +868,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size); - if ((ext2_use_xip(sb)) && ((blocksize != PAGE_SIZE) || - (sb->s_blocksize != blocksize))) { + if (ext2_use_xip(sb) && blocksize != PAGE_SIZE) { if (!silent) printk("XIP: Unsupported blocksize\n"); goto failed_mount;