Commit fe1bff65 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Simply dequeue iopen glock in gfs2_evict_inode 



With the previous change, to simplify things, we can always just dequeue
and uninitialize the iopen glock in gfs2_evict_inode() even if it isn't
queued anymore.

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

fs/gfs2/super.c

+2 −5
Original line number Diff line number Diff line
@@ -1419,12 +1419,9 @@ static void gfs2_evict_inode(struct inode *inode) 
		struct gfs2_glock *gl = ip->i_iopen_gh.gh_gl;



		glock_clear_object(gl, ip);

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

			ip->i_iopen_gh.gh_flags |= GL_NOCACHE;

			gfs2_glock_dq(&ip->i_iopen_gh);

		}

		gfs2_glock_hold(gl);

		gfs2_holder_uninit(&ip->i_iopen_gh);

		ip->i_iopen_gh.gh_flags |= GL_NOCACHE;

		gfs2_glock_dq_uninit(&ip->i_iopen_gh);

		gfs2_glock_put_eventually(gl);

	}

	if (ip->i_gl) {