From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Otte Subject: Re: [patch] ext2: xip check fix Date: Wed, 05 Dec 2007 16:43:16 +0100 Message-ID: <4756C714.2040809@de.ibm.com> References: <20071204042628.GA26636@wotan.suse.de> <200712041054.51599.borntraeger@de.ibm.com> <20071204101009.GB9618@wotan.suse.de> <20071204112100.GA20420@wotan.suse.de> <20071204112327.GB20420@wotan.suse.de> Reply-To: carsteno@de.ibm.com Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Christian Borntraeger , Linux Kernel Mailing List , linux-fsdevel@vger.kernel.org, "Eric W. Biederman" , Andrew Morton , rob@landley.net, Jens Axboe To: Nick Piggin Return-path: Received: from mout2.freenet.de ([195.4.92.92]:46886 "EHLO mout2.freenet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751781AbXLEPna (ORCPT ); Wed, 5 Dec 2007 10:43:30 -0500 In-Reply-To: <20071204112327.GB20420@wotan.suse.de> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Nick Piggin wrote: > Am I missing something here? I wonder how s390 works without this change? > > -- > ext2 should not worry about checking sb->s_blocksize for XIP before the > sb's blocksize actually gets set. > > Signed-off-by: Nick Piggin > --- > Index: linux-2.6/fs/ext2/super.c > =================================================================== > --- linux-2.6.orig/fs/ext2/super.c > +++ linux-2.6/fs/ext2/super.c > @@ -844,8 +844,7 @@ static int ext2_fill_super(struct super_ > > 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; "blocksize" contains the blocksize of the device here, and sb->s_blocksize does contain the filesystem block size as saved in the super block. Xip does only work, if both do match PAGE_SIZE because it does'nt support multiple calls to direct_access in the get_xip_page address space operation. Thus we check both here, actually this was changed from how it looks after your patch as a bugfix where our tester tried a 4k filesystem on a 2k blockdev. Did I miss something?