diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2010-07-29 14:39:29 +0100 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2010-07-29 14:39:29 +0100 |
| commit | 7cdee5dbf477409e4afc6c9063492dc2577b41ea (patch) | |
| tree | cfa14683839870e542666cc3630dcb900e11ef01 | |
| parent | d5341a92416706808dc5cd847826f28c08063c8c (diff) | |
| download | op-kernel-dev-7cdee5dbf477409e4afc6c9063492dc2577b41ea.zip op-kernel-dev-7cdee5dbf477409e4afc6c9063492dc2577b41ea.tar.gz | |
Revert "GFS2: recovery stuck on transaction lock"
This reverts commit b7dc2df5725fe7355fd76000ead7e39728e1b8a9.
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>
| -rw-r--r-- | fs/gfs2/glock.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 717531d..2b3d8f8 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -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; |
