From cd16182aec56b2765d5a3a06c73fd65990a7a6bb Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Wed, 6 Feb 2008 01:37:42 -0800
Subject: [PATCH] --- yaml --- r: 83463 b: refs/heads/master c:
 a8e3eff4668e3a4d6dbe7985a780f91de38a3c71 h: refs/heads/master i:   83461:
 a5396a8206a6fb9c4e0b9f658875cc53b532f710   83459:
 990e2ae7defa69749b5bc97927325bbf77cc0189   83455:
 f3ddd4272cb8a8f272480b586747afcd74a93611 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext2/super.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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;