Commit d4da3198 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Bob Peterson
Browse files

Revert "GFS2: Wait for iopen glock dequeues" 



Revert commit 86d067a7: it turns out
that waiting for iopen glock dequeues here isn't needed anymore because
the bugs that commit was meant to fix have been fixed otherwise.

In addition, we want to avoid waiting on glocks in gfs2_evict_inode in
shrinker context because the shrinker may be invoked on behalf of DLM,
in which case calling into DLM again would deadlock.  This commit makes
the described scenario less likely without completely avoiding it; it's
still a step in the right direction, though.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent 0a52aba7

fs/gfs2/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -202,8 +202,7 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned int type, 
fail_refresh:

	ip->i_iopen_gh.gh_flags |= GL_NOCACHE;

	ip->i_iopen_gh.gh_gl->gl_object = NULL;

	gfs2_glock_dq_wait(&ip->i_iopen_gh);

	gfs2_holder_uninit(&ip->i_iopen_gh);

	gfs2_glock_dq_uninit(&ip->i_iopen_gh);

fail_put:

	if (io_gl)

		gfs2_glock_put(io_gl);

fs/gfs2/super.c

+3 −5
Original line number Diff line number Diff line
@@ -1539,8 +1539,7 @@ static void gfs2_evict_inode(struct inode *inode) 
	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_SKIP, &gh);

	if (unlikely(error)) {

		ip->i_iopen_gh.gh_flags |= GL_NOCACHE;

		gfs2_glock_dq_wait(&ip->i_iopen_gh);

		gfs2_holder_uninit(&ip->i_iopen_gh);

		gfs2_glock_dq_uninit(&ip->i_iopen_gh);

		goto out;

	}
@@ -1618,7 +1617,7 @@ out_unlock: 
	if (gfs2_holder_initialized(&ip->i_iopen_gh)) {

		if (test_bit(HIF_HOLDER, &ip->i_iopen_gh.gh_iflags)) {

			ip->i_iopen_gh.gh_flags |= GL_NOCACHE;

			gfs2_glock_dq_wait(&ip->i_iopen_gh);

			gfs2_glock_dq(&ip->i_iopen_gh);

		}

		gfs2_holder_uninit(&ip->i_iopen_gh);

	}
@@ -1640,8 +1639,7 @@ out: 
	if (gfs2_holder_initialized(&ip->i_iopen_gh)) {

		ip->i_iopen_gh.gh_gl->gl_object = NULL;

		ip->i_iopen_gh.gh_flags |= GL_NOCACHE;

		gfs2_glock_dq_wait(&ip->i_iopen_gh);

		gfs2_holder_uninit(&ip->i_iopen_gh);

		gfs2_glock_dq_uninit(&ip->i_iopen_gh);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE