Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2f9c812 authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

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: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 2ebc3f8b

fs/gfs2/bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

fs/gfs2/meta_io.c

+6 −15
Original line number Diff line number Diff line
@@ -374,34 +374,25 @@ 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;



	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;

	}

	}

	*bhp = bh;

	return ret;

}

fs/gfs2/meta_io.h

+2 −2
Original line number Diff line number Diff line
@@ -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);