From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753644Ab0LaQPT (ORCPT ); Fri, 31 Dec 2010 11:15:19 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:60416 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751682Ab0LaQPS (ORCPT ); Fri, 31 Dec 2010 11:15:18 -0500 Date: Fri, 31 Dec 2010 17:15:12 +0100 From: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= To: Stephen Rothwell Cc: Jiri Kosina , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Theodore Ts'o" Subject: Re: linux-next: manual merge of the trivial tree with the ext4 tree Message-ID: <20101231161512.GG14221@pengutronix.de> References: <20101231125721.3c3f4604.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20101231125721.3c3f4604.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, On Fri, Dec 31, 2010 at 12:57:21PM +1100, Stephen Rothwell wrote: > diff --cc fs/ext4/ext4.h > index 2a73925,1f253a9..0000000 > --- a/fs/ext4/ext4.h > +++ b/fs/ext4/ext4.h > @@@ -561,7 -561,23 +561,7 @@@ struct ext4_new_group_data > #define EXT4_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION > #endif > > - /* Max physical block we can addres w/o extents */ > - > -/* > - * Mount options > - */ > -struct ext4_mount_options { > - unsigned long s_mount_opt; > - uid_t s_resuid; > - gid_t s_resgid; > - unsigned long s_commit_interval; > - u32 s_min_batch_time, s_max_batch_time; > -#ifdef CONFIG_QUOTA > - int s_jquota_fmt; > - char *s_qf_names[MAXQUOTAS]; > -#endif > -}; > - > + /* Max physical block we can address w/o extents */ > #define EXT4_MAX_BLOCK_FILE_PHYS 0xFFFFFFFF > > /* > Looks correct. Independant of this I think it would be better to define EXT4_MAX_BLOCK_FILE_PHYS to 0xFFFFFFFFUL to have the same type on all platforms. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |