From: Nick Piggin <npiggin@suse.de>
Date: Wed, 6 Feb 2008 09:37:42 +0000 (-0800)
Subject: ext2: xip check fix
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a8e3eff4668e3a4d6dbe7985a780f91de38a3c71;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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)
 
 	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;