summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2008-01-28 11:24:35 -0600
committerSteven Whitehouse <swhiteho@redhat.com>2008-03-31 10:39:57 +0100
commit7eabb77e65c559d9c284da232b9ba5354898028a (patch)
treeb5df9c7ca0317abde3b76e56dc8f6c0050d9558e
parentd0109bfa84d6603becac8c2e87b3716f557f2039 (diff)
downloadop-kernel-dev-7eabb77e65c559d9c284da232b9ba5354898028a.zip
op-kernel-dev-7eabb77e65c559d9c284da232b9ba5354898028a.tar.gz
[GFS2] Misc fixups
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. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/bmap.c3
-rw-r--r--fs/gfs2/ops_address.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index e8e48b6..e84e384 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 ac772b6..7523999 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) */
OpenPOWER on IntegriCloud