diff options
| author | Bob Peterson | 2014-06-26 16:46:25 +0200 |
|---|---|---|
| committer | Steven Whitehouse | 2014-07-18 12:13:56 +0200 |
| commit | 5bef3e7cf18c56cc733777c61b6b61a0b8a62b35 (patch) | |
| tree | a3b75df7abfcb6dcb77139cf23c540e51d761f7e /fs/gfs2/file.c | |
| parent | GFS2: replace count*size kzalloc by kcalloc (diff) | |
| download | kernel-qcow2-linux-5bef3e7cf18c56cc733777c61b6b61a0b8a62b35.tar.gz kernel-qcow2-linux-5bef3e7cf18c56cc733777c61b6b61a0b8a62b35.tar.xz kernel-qcow2-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 'fs/gfs2/file.c')
| -rw-r--r-- | fs/gfs2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 4fc3a3046174..491e8e023598 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -991,7 +991,7 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl) goto out; flock_lock_file_wait(file, &(struct file_lock){.fl_type = F_UNLCK}); - gfs2_glock_dq_wait(fl_gh); + gfs2_glock_dq(fl_gh); gfs2_holder_reinit(state, flags, fl_gh); } else { error = gfs2_glock_get(GFS2_SB(&ip->i_inode), ip->i_no_addr, |