GFS2: Add non-try locks back to get_local_rgrp (c688b8b3) · Commits · 戴 / test

This upstream patch had what I believe is an unintended consequence: http://git.kernel.org/?p=linux/kernel/git/steve/gfs2-3.0-nmw.git;a=commitdiff;h=beca42486749c1538a5ed58fe9dcc9f26d428c93 The patch changed function get_local_rgrp such that it ONLY used TRY locks for RGRP searches. Prior to that patch, the code used TRY locks during the first loop, and if that was unsuccessful, it used normal blocking locks on subsequent searches. This patch changes it back to the old way. Signed-off-by:

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

Steven Whitehouse <swhiteho@redhat.com>

fs/gfs2/rgrp.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -978,7 +978,7 @@ static int get_local_rgrp(struct gfs2_inode ip, u64 last_unlinked)
		struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
		struct gfs2_rgrpd rgd, begin = NULL;
		struct gfs2_alloc *al = ip->i_alloc;
		int error, rg_locked;
		int error, rg_locked, flags = LM_FLAG_TRY;
		int loops = 0;

		if (ip->i_rgd && rgrp_contains_block(ip->i_rgd, ip->i_goal))
		@@ -997,7 +997,7 @@ static int get_local_rgrp(struct gfs2_inode ip, u64 last_unlinked)
		error = 0;
		} else {
		error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE,
		LM_FLAG_TRY, &al->al_rgd_gh);
		flags, &al->al_rgd_gh);
		}
		switch (error) {
		case 0:
		@@ -1012,8 +1012,10 @@ static int get_local_rgrp(struct gfs2_inode ip, u64 last_unlinked)
		/* fall through */
		case GLR_TRYFAILED:
		rgd = gfs2_rgrpd_get_next(rgd);
		if (rgd == begin)
		if (rgd == begin) {
		flags = 0;
		loops++;
		}
		break;
		default:
		return error;

Admin message