diff options
| author |   Bob Peterson <rpeterso@redhat.com> | 2014-06-26 10:46:25 -0400 |
|---|---|---|
| committer |   Steven Whitehouse <swhiteho@redhat.com> | 2014-07-18 11:13:56 +0100 |
| commit | 5bef3e7cf18c56cc733777c61b6b61a0b8a62b35 (patch) | |
| tree | a3b75df7abfcb6dcb77139cf23c540e51d761f7e /fs/gfs2/glock.c | |
| parent | GFS2: replace count*size kzalloc by kcalloc (diff) | |
| download | wireguard-linux-5bef3e7cf18c56cc733777c61b6b61a0b8a62b35.tar.xz wireguard-linux-5bef3e7cf18c56cc733777c61b6b61a0b8a62b35.zip | |
GFS2: Allow flocks to use normal glock dq rather than dq_wait
This patch allows flock glocks to use a non-blocking dequeue rather
than dq_wait. It also reverts the previous patch I had posted regarding
dq_wait. The reverted patch isn't necessarily a bad idea, but I decided
this might avoid unforeseen side effects, and was therefore safer.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/gfs2/glock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index b703dcc91588..ee4e04fe60fc 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -1128,9 +1128,7 @@ void gfs2_glock_dq_wait(struct gfs2_holder *gh) struct gfs2_glock *gl = gh->gh_gl; gfs2_glock_dq(gh); might_sleep(); - if (!find_first_holder(gl)) - wait_on_bit(&gl->gl_flags, GLF_DEMOTE, gfs2_glock_demote_wait, - TASK_UNINTERRUPTIBLE); + wait_on_bit(&gl->gl_flags, GLF_DEMOTE, gfs2_glock_demote_wait, TASK_UNINTERRUPTIBLE); } /** |