Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cdee5db authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

Revert "GFS2: recovery stuck on transaction lock" 



This reverts commit b7dc2df5.

The initial patch didn't quite work since it doesn't cover all
the possible routes by which the GLF_FROZEN flag might be set.
A revised fix is coming up in the next patch.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent d5341a92

fs/gfs2/glock.c

+0 −10
Original line number Diff line number Diff line
@@ -707,18 +707,8 @@ static void glock_work_func(struct work_struct *work) 
{

	unsigned long delay = 0;

	struct gfs2_glock *gl = container_of(work, struct gfs2_glock, gl_work.work);

	struct gfs2_holder *gh;

	int drop_ref = 0;



	if (unlikely(test_bit(GLF_FROZEN, &gl->gl_flags))) {

		spin_lock(&gl->gl_spin);

		gh = find_first_waiter(gl);

		if (gh && (gh->gh_flags & LM_FLAG_NOEXP) &&

		    test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))

			set_bit(GLF_REPLY_PENDING, &gl->gl_flags);

		spin_unlock(&gl->gl_spin);

	}



	if (test_and_clear_bit(GLF_REPLY_PENDING, &gl->gl_flags)) {

		finish_xmote(gl, gl->gl_reply);

		drop_ref = 1;