Commit c3abc29e authored by Bob Peterson's avatar Bob Peterson
Browse files

gfs2: Remove unnecessary gfs2_rlist_alloc parameter 



The state parameter of gfs2_rlist_alloc is set to LM_ST_EXCLUSIVE in all
calls, so remove it and hardcode that state in gfs2_rlist_alloc instead.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Reviewed-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent ec23df2b

fs/gfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -2021,7 +2021,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, 
		l_blocks++;

	}



	gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE);

	gfs2_rlist_alloc(&rlist);



	for (x = 0; x < rlist.rl_rgrps; x++) {

		struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(rlist.rl_ghs[x].gh_gl);

fs/gfs2/rgrp.c

+2 −3
Original line number Diff line number Diff line
@@ -2668,13 +2668,12 @@ void gfs2_rlist_add(struct gfs2_inode *ip, struct gfs2_rgrp_list *rlist, 
 * gfs2_rlist_alloc - all RGs have been added to the rlist, now allocate

 *      and initialize an array of glock holders for them

 * @rlist: the list of resource groups

 * @state: the lock state to acquire the RG lock in

 *

 * FIXME: Don't use NOFAIL

 *

 */



void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist, unsigned int state)

void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist)

{

	unsigned int x;
@@ -2683,7 +2682,7 @@ void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist, unsigned int state) 
				      GFP_NOFS | __GFP_NOFAIL);

	for (x = 0; x < rlist->rl_rgrps; x++)

		gfs2_holder_init(rlist->rl_rgd[x]->rd_gl,

				state, 0,

				LM_ST_EXCLUSIVE, 0,

				&rlist->rl_ghs[x]);

}

fs/gfs2/rgrp.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct gfs2_rgrp_list { 


extern void gfs2_rlist_add(struct gfs2_inode *ip, struct gfs2_rgrp_list *rlist,

			   u64 block);

extern void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist, unsigned int state);

extern void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist);

extern void gfs2_rlist_free(struct gfs2_rgrp_list *rlist);

extern u64 gfs2_ri_total(struct gfs2_sbd *sdp);

extern void gfs2_rgrp_dump(struct seq_file *seq, const struct gfs2_glock *gl);

fs/gfs2/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -1299,7 +1299,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip) 
	else

		goto out;



	gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE);

	gfs2_rlist_alloc(&rlist);



	for (x = 0; x < rlist.rl_rgrps; x++) {

		struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(rlist.rl_ghs[x].gh_gl);