From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Date: Tue, 29 Jan 2008 08:33:20 +0000 Subject: [Cluster-devel] [GFS2 PATCH] Misc fixups In-Reply-To: <1201541075.18461.88.camel@technetium.msp.redhat.com> References: <1201541075.18461.88.camel@technetium.msp.redhat.com> Message-ID: <1201595600.22038.320.camel@quoit> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, Now in the -nmw tree. Thanks, Steve. On Mon, 2008-01-28 at 11:24 -0600, Bob Peterson wrote: > Hi, > > This patch contains two small fixups that didn't fit elsewhere. > They are: (1) get rid of temp variable in find_metapath. > (2) Remove vestigial "ret" variable from gfs2_writepage_common. > > Regards, > > Bob Peterson > Red Hat GFS > > Signed-off-by: Bob Peterson > -- > fs/gfs2/bmap.c | 3 +-- > fs/gfs2/ops_address.c | 4 +--- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c > index 2a90084..359231e 100644 > --- a/fs/gfs2/bmap.c > +++ b/fs/gfs2/bmap.c > @@ -305,11 +305,10 @@ static void find_metapath(struct gfs2_inode *ip, u64 block, > struct metapath *mp) > { > struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode); > - u64 b = block; > unsigned int i; > > for (i = ip->i_height; i--;) > - mp->mp_list[i] = do_div(b, sdp->sd_inptrs); > + mp->mp_list[i] = do_div(block, sdp->sd_inptrs); > > } > > diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c > index 38dbe99..e601016 100644 > --- a/fs/gfs2/ops_address.c > +++ b/fs/gfs2/ops_address.c > @@ -1,6 +1,6 @@ > /* > * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. > - * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. > + * Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved. > * > * This copyrighted material is made available to anyone wishing to use, > * modify, copy, or redistribute it subject to the terms and conditions > @@ -104,11 +104,9 @@ static int gfs2_writepage_common(struct page *page, > loff_t i_size = i_size_read(inode); > pgoff_t end_index = i_size >> PAGE_CACHE_SHIFT; > unsigned offset; > - int ret = -EIO; > > if (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(ip->i_gl))) > goto out; > - ret = 0; > if (current->journal_info) > goto redirty; > /* Is the page fully outside i_size? (truncate in progress) */ > >