Commit 44dab005 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Minor gfs2_glock_nq_m cleanup 



Add state and flags arguments to gfs2_rlist_alloc() to make it somewhat more
obvious which state and flags an rlist uses.  With that, stop knocking off
flags in gfs2_glock_nq_m() and its nq_m_sync() helper that are never set in the
first place.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent fe39dc98

fs/gfs2/dir.c

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

	}



	gfs2_rlist_alloc(&rlist);

	gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE, LM_FLAG_NODE_SCOPE);



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

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

fs/gfs2/glock.c

+1 −5
Original line number Diff line number Diff line
@@ -1780,7 +1780,7 @@ static int glock_compare(const void *arg_a, const void *arg_b) 
}



/**

 * nq_m_sync - synchonously acquire more than one glock in deadlock free order

 * nq_m_sync - synchronously acquire more than one glock in deadlock free order

 * @num_gh: the number of structures

 * @ghs: an array of struct gfs2_holder structures

 * @p: placeholder for the holder structure to pass back
@@ -1801,8 +1801,6 @@ static int nq_m_sync(unsigned int num_gh, struct gfs2_holder *ghs, 
	sort(p, num_gh, sizeof(struct gfs2_holder *), glock_compare, NULL);



	for (x = 0; x < num_gh; x++) {

		p[x]->gh_flags &= ~(LM_FLAG_TRY | GL_ASYNC);



		error = gfs2_glock_nq(p[x]);

		if (error) {

			while (x--)
@@ -1819,7 +1817,6 @@ static int nq_m_sync(unsigned int num_gh, struct gfs2_holder *ghs, 
 * @num_gh: the number of structures

 * @ghs: an array of struct gfs2_holder structures

 *

 *

 * Returns: 0 on success (all glocks acquired),

 *          errno on failure (no glocks acquired)

 */
@@ -1834,7 +1831,6 @@ int gfs2_glock_nq_m(unsigned int num_gh, struct gfs2_holder *ghs) 
	case 0:

		return 0;

	case 1:

		ghs->gh_flags &= ~(LM_FLAG_TRY | GL_ASYNC);

		return gfs2_glock_nq(ghs);

	default:

		if (num_gh <= 4)

fs/gfs2/rgrp.c

+6 −3
Original line number Diff line number Diff line
@@ -2720,12 +2720,15 @@ 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 state we're requesting

 * @flags: the modifier flags

 *

 * FIXME: Don't use NOFAIL

 *

 */



void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist)

void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist,

		      unsigned int state, u16 flags)

{

	unsigned int x;
@@ -2733,8 +2736,8 @@ void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist) 
				      sizeof(struct gfs2_holder),

				      GFP_NOFS | __GFP_NOFAIL);

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

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

				 LM_FLAG_NODE_SCOPE, &rlist->rl_ghs[x]);

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

				 &rlist->rl_ghs[x]);

}



/**

fs/gfs2/rgrp.h

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

extern void gfs2_rlist_alloc(struct gfs2_rgrp_list *rlist,

			     unsigned int state, u16 flags);

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, struct gfs2_rgrpd *rgd,

fs/gfs2/xattr.c

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

		goto out;



	gfs2_rlist_alloc(&rlist);

	gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE, LM_FLAG_NODE_SCOPE);



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

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