From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MbgTN-0000Dy-Ou for mharc-grub-devel@gnu.org; Thu, 13 Aug 2009 16:00:29 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MbgTL-0000DX-Pd for grub-devel@gnu.org; Thu, 13 Aug 2009 16:00:27 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MbgTG-0000D5-R1 for grub-devel@gnu.org; Thu, 13 Aug 2009 16:00:27 -0400 Received: from [199.232.76.173] (port=51750 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbgTG-0000D2-MJ for grub-devel@gnu.org; Thu, 13 Aug 2009 16:00:22 -0400 Received: from xvm-190-8.ghst.net ([217.70.190.8]:59812 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MbgTG-0008MP-3z for grub-devel@gnu.org; Thu, 13 Aug 2009 16:00:22 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1MbgTE-0000Md-48 for grub-devel@gnu.org; Thu, 13 Aug 2009 22:00:20 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1MbgT8-0005rI-SO for grub-devel@gnu.org; Thu, 13 Aug 2009 22:00:14 +0200 Date: Thu, 13 Aug 2009 22:00:14 +0200 From: Robert Millan To: The development of GRUB 2 Message-ID: <20090813200014.GB22130@thorin> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: [PATCH 1/2] Split ufs.mod into ufs1.mod and ufs2.mod X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2009 20:00:28 -0000 On Thu, Aug 13, 2009 at 06:03:44PM +0200, Vladimir 'phcoder' Serbinenko wrote: > ufs1 and ufs2 mainly differ by some structure definitions. Putting > them into the same module and checking on runtime creates continuous > if ( ... == UFS1) { ... } > By using preprocessor it's possible to avoid most of such ifs > Additionally user needs only one FS in core so we save some space > core.img with ufs.mod: 23793 > core.img with ufs1.mod: 23078 > core.img with ufs2.mod: 23322 Very nice. > +#ifdef MODE_UFS2 > +#define INODE_BLKSZ 8 > +#else > +#define INODE_BLKSZ 4 > +#endif > +#ifndef MODE_UFS2 > +#define UFS_INODE_PER_BLOCK 4 > +#else > +#define UFS_INODE_PER_BLOCK 2 > +#endif When you commit this, could you please follow logical order with ifdef/else/endif? The negation is less intuitive to read. > +#ifdef MODE_UFS2 > + grub_uint64_t indir[UFS_BLKSZ (sblock) / sizeof (grub_uint64_t)]; > +#else > + grub_uint32_t indir[UFS_BLKSZ (sblock) / sizeof (grub_uint32_t)]; > +#endif Can this be made simpler by using typeof() ? (same for the other one below) > - return (data->ufs_type == UFS1) ? indir[blk] : indir[blk << 1]; > + return indir[blk]; The blk bitshift was accounted for elsewhere? (Btw I assume you've tested on both filesystem types). > - ? dirent.namelen_bsd : grub_le_to_cpu16 (dirent.namelen); > +#ifdef MODE_UFS2 > + namelen = dirent.namelen_bsd; > +#else > + namelen = grub_le_to_cpu16 (dirent.namelen); > +#endif I wonder if there was a bug here (native endianess assumed for namelen_bsd?) -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."