Commit a8e3eff4 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

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: default avatarNick Piggin <npiggin@suse.de>
Acked-by: default avatarCarsten Otte <cotte@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cce992bc
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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;