Revert "GFS2: recovery stuck on transaction lock"
This reverts commit b7dc2df572
.
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: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
d5341a9241
commit
7cdee5dbf4
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user