GFS2: Eliminate unused "new" parameter to gfs2_meta_indirect_buffer

It turns out that the "new" parameter to function gfs2_meta_indirect_buffer
was always being passed in as zero. Therefore, this patch eliminates it
and simplifies the function.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 420bbeb86147cda746ddfd0f8bdc264b5288aeaf..dab54099dd98ecab64a820f168dcf2ff8466ad60 100644 (file)
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -324,7 +324,7 @@ static int lookup_metapath(struct gfs2_inode *ip, struct metapath *mp)
                if (!dblock)
                        return x + 1;
 
-               ret = gfs2_meta_indirect_buffer(ip, x+1, dblock, 0, &mp->mp_bh[x+1]);
+               ret = gfs2_meta_indirect_buffer(ip, x+1, dblock, &mp->mp_bh[x+1]);
                if (ret)
                        return ret;
        }
@@ -882,7 +882,7 @@ static int recursive_scan(struct gfs2_inode *ip, struct buffer_head *dibh,
                top = (__be64 *)(bh->b_data + sizeof(struct gfs2_dinode)) + mp->mp_list[0];
                bottom = (__be64 *)(bh->b_data + sizeof(struct gfs2_dinode)) + sdp->sd_diptrs;
        } else {
-               error = gfs2_meta_indirect_buffer(ip, height, block, 0, &bh);
+               error = gfs2_meta_indirect_buffer(ip, height, block, &bh);
                if (error)
                        return error;
 

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 7f69ae2595f00db86d48a7566e55803ba3d8306c..6c1e5d1c404a1feb3a714495fc6e34d575d5ad56 100644 (file)
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -374,33 +374,24 @@ void gfs2_meta_wipe(struct gfs2_inode *ip, u64 bstart, u32 blen)
  * @ip: The GFS2 inode
  * @height: The level of this buf in the metadata (indir addr) tree (if any)
  * @num: The block number (device relative) of the buffer
- * @new: Non-zero if we may create a new buffer
  * @bhp: the buffer is returned here
  *
  * Returns: errno
  */
 
 int gfs2_meta_indirect_buffer(struct gfs2_inode *ip, int height, u64 num,
-                             int new, struct buffer_head **bhp)
+                             struct buffer_head **bhp)
 {
        struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
        struct gfs2_glock *gl = ip->i_gl;
        struct buffer_head *bh;
        int ret = 0;
+       u32 mtype = height ? GFS2_METATYPE_IN : GFS2_METATYPE_DI;
 
-       if (new) {
-               BUG_ON(height == 0);
-               bh = gfs2_meta_new(gl, num);
-               gfs2_trans_add_bh(ip->i_gl, bh, 1);
-               gfs2_metatype_set(bh, GFS2_METATYPE_IN, GFS2_FORMAT_IN);
-               gfs2_buffer_clear_tail(bh, sizeof(struct gfs2_meta_header));
-       } else {
-               u32 mtype = height ? GFS2_METATYPE_IN : GFS2_METATYPE_DI;
-               ret = gfs2_meta_read(gl, num, DIO_WAIT, &bh);
-               if (ret == 0 && gfs2_metatype_check(sdp, bh, mtype)) {
-                       brelse(bh);
-                       ret = -EIO;
-               }
+       ret = gfs2_meta_read(gl, num, DIO_WAIT, &bh);
+       if (ret == 0 && gfs2_metatype_check(sdp, bh, mtype)) {
+               brelse(bh);
+               ret = -EIO;
        }
        *bhp = bh;
        return ret;

diff --git a/fs/gfs2/meta_io.h b/fs/gfs2/meta_io.h
index 22c526593131327e8582cb02b9b467876d27f6c4..c30973b07a7caf54ae5c04e80be2cc6706aeb57e 100644 (file)
--- a/fs/gfs2/meta_io.h
+++ b/fs/gfs2/meta_io.h
@@ -65,12 +65,12 @@ void gfs2_remove_from_journal(struct buffer_head *bh, struct gfs2_trans *tr,
 void gfs2_meta_wipe(struct gfs2_inode *ip, u64 bstart, u32 blen);
 
 int gfs2_meta_indirect_buffer(struct gfs2_inode *ip, int height, u64 num,
-                             int new, struct buffer_head **bhp);
+                             struct buffer_head **bhp);
 
 static inline int gfs2_meta_inode_buffer(struct gfs2_inode *ip,
                                         struct buffer_head **bhp)
 {
-       return gfs2_meta_indirect_buffer(ip, 0, ip->i_no_addr, 0, bhp);
+       return gfs2_meta_indirect_buffer(ip, 0, ip->i_no_addr, bhp);
 }
 
 struct buffer_head *gfs2_meta_ra(struct gfs2_glock *gl, u64 dblock, u32 extlen);