2 files changed, 2 insertions, 5 deletions

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index e8e48b690cef..e84e3845a394 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 ac772b6d9dbb..7523999afc53 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) */