From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Subject: Re: [PATCH] GFS2: incorrect di_height assignment Date: Thu, 02 Nov 2006 12:12:43 +0000 Message-ID: <1162469563.27980.285.camel@quoit.chygwyn.com> References: <20061102034556.GB4899@martell.zuzino.mipt.ru> <20061102105936.GB714@infradead.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-Hd37xKLEhKkLgYe4nz5k" Cc: Alexey Dobriyan , Andrew Morton , linux-fsdevel@vger.kernel.org Return-path: Received: from mx1.redhat.com ([66.187.233.31]:50409 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S1752149AbWKBMMV (ORCPT ); Thu, 2 Nov 2006 07:12:21 -0500 To: Christoph Hellwig In-Reply-To: <20061102105936.GB714@infradead.org> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org --=-Hd37xKLEhKkLgYe4nz5k Content-Type: text/plain Content-Transfer-Encoding: 7bit Hi, On Thu, 2006-11-02 at 10:59 +0000, Christoph Hellwig wrote: > On Thu, Nov 02, 2006 at 06:45:56AM +0300, Alexey Dobriyan wrote: > > Harmless, but needed for endian-clean GFS2. > > > > Signed-off-by: Alexey Dobriyan > > --- > > > > fs/gfs2/inode.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > --- a/fs/gfs2/inode.c > > +++ b/fs/gfs2/inode.c > > @@ -691,7 +691,7 @@ static void init_dinode(struct gfs2_inod > > > > di->__pad1 = 0; > > di->di_payload_format = cpu_to_be32(0); > > - di->di_height = cpu_to_be32(0); > > + di->di_height = cpu_to_be16(0); > > you are allowed to directly assign 0 to __be* variables. > Alexey, thanks for pointing this out. Attached is a patch which incorporates Christoph's comments. I've applied it to my -nmw (next merge window) git tree since its not really a bug fix as such, Steve. --=-Hd37xKLEhKkLgYe4nz5k Content-Description: Patch to tidy up initialisations in inode.c Content-Disposition: attachment; filename=0033-GFS2-Tidy-up-0-initialisations-in-inode.c.txt Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit >>From cf768f81b0ae4c20fc96e70beb512ddaf655d624 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Thu, 2 Nov 2006 11:59:28 -0500 Subject: [PATCH] [GFS2] Tidy up 0 initialisations in inode.c We don't need to use endian conversions for 0 initialisations when creating a new on-disk inode. Cc: Christoph Hellwig Cc: Alexey Dobriyan Signed-off-by: Steven Whitehouse --- fs/gfs2/inode.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index e467780..faf9b9e 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -673,15 +673,15 @@ static void init_dinode(struct gfs2_inod di->di_mode = cpu_to_be32(mode); di->di_uid = cpu_to_be32(uid); di->di_gid = cpu_to_be32(gid); - di->di_nlink = cpu_to_be32(0); - di->di_size = cpu_to_be64(0); + di->di_nlink = 0; + di->di_size = 0; di->di_blocks = cpu_to_be64(1); di->di_atime = di->di_mtime = di->di_ctime = cpu_to_be64(get_seconds()); di->di_major = cpu_to_be32(MAJOR(dev)); di->di_minor = cpu_to_be32(MINOR(dev)); di->di_goal_meta = di->di_goal_data = cpu_to_be64(inum->no_addr); di->di_generation = cpu_to_be64(*generation); - di->di_flags = cpu_to_be32(0); + di->di_flags = 0; if (S_ISREG(mode)) { if ((dip->i_di.di_flags & GFS2_DIF_INHERIT_JDATA) || @@ -699,13 +699,13 @@ static void init_dinode(struct gfs2_inod di->__pad1 = 0; di->di_payload_format = cpu_to_be32(S_ISDIR(mode) ? GFS2_FORMAT_DE : 0); - di->di_height = cpu_to_be32(0); + di->di_height = 0; di->__pad2 = 0; di->__pad3 = 0; - di->di_depth = cpu_to_be16(0); - di->di_entries = cpu_to_be32(0); + di->di_depth = 0; + di->di_entries = 0; memset(&di->__pad4, 0, sizeof(di->__pad4)); - di->di_eattr = cpu_to_be64(0); + di->di_eattr = 0; memset(&di->di_reserved, 0, sizeof(di->di_reserved)); brelse(dibh); -- 1.4.1 --=-Hd37xKLEhKkLgYe4nz5k--