gfs2: Remove unnecessary gfs2_rlist_alloc parameter

AstralBob · AstralBob · commit c3abc29e54a1 · 2018-10-12T07:32:28.000-05:00
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: Andreas Gruenbacher &lt;agruenba@redhat.com&gt;
Signed-off-by: Bob Peterson &lt;rpeterso@redhat.com&gt;
Reviewed-by: Steven Whitehouse &lt;swhiteho@redhat.com&gt;
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
@@ -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);
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
@@ -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]);
 }
 
diff --git a/fs/gfs2/rgrp.h b/fs/gfs2/rgrp.h
@@ -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);
diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -2021,7 +2021,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,`
`2021`	`2021`	`l_blocks++;`
`2022`	`2022`	`}`
`2023`	`2023`
`2024`		`- gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE);`
	`2024`	`+ gfs2_rlist_alloc(&rlist);`
`2025`	`2025`
`2026`	`2026`	`for (x = 0; x < rlist.rl_rgrps; x++) {`
`2027`	`2027`	`struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(rlist.rl_ghs[x].gh_gl);`
Original file line number	Diff line number	Diff line change
`@@ -2668,13 +2668,12 @@ void gfs2_rlist_add(struct gfs2_inode ip, struct gfs2_rgrp_list rlist,`
`2668`	`2668`	`* gfs2_rlist_alloc - all RGs have been added to the rlist, now allocate`
`2669`	`2669`	`* and initialize an array of glock holders for them`
`2670`	`2670`	`* @rlist: the list of resource groups`
`2671`		`- * @state: the lock state to acquire the RG lock in`
`2672`	`2671`	`*`
`2673`	`2672`	`* FIXME: Don't use NOFAIL`
`2674`	`2673`	`*`
`2675`	`2674`	`*/`
`2676`	`2675`
`2677`		`-void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist, unsigned int state)`
	`2676`	`+void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist)`
`2678`	`2677`	`{`
`2679`	`2678`	`unsigned int x;`
`2680`	`2679`
`@@ -2683,7 +2682,7 @@ void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist, unsigned int state)`
`2683`	`2682`	`GFP_NOFS \| __GFP_NOFAIL);`
`2684`	`2683`	`for (x = 0; x < rlist->rl_rgrps; x++)`
`2685`	`2684`	`gfs2_holder_init(rlist->rl_rgd[x]->rd_gl,`
`2686`		`- state, 0,`
	`2685`	`+ LM_ST_EXCLUSIVE, 0,`
`2687`	`2686`	`&rlist->rl_ghs[x]);`
`2688`	`2687`	`}`
`2689`	`2688`