diff options
| author | David Teigland <teigland@redhat.com> | 2007-06-08 17:01:40 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-07-09 08:23:33 +0100 |
| commit | a7a2ff8a951ab373732116e7c31e2e1fe025d5e0 (patch) | |
| tree | aec05033231051f07af384f2e89dd500ff3d7a66 /fs/gfs2/locking | |
| parent | d88101d4d82ea09433692af30618c3b7afb7da02 (diff) | |
| download | kernel-crypto-a7a2ff8a951ab373732116e7c31e2e1fe025d5e0.tar.gz kernel-crypto-a7a2ff8a951ab373732116e7c31e2e1fe025d5e0.tar.xz kernel-crypto-a7a2ff8a951ab373732116e7c31e2e1fe025d5e0.zip | |
[GFS2] return conflicts for GETLK
We weren't returning the correct result when GETLK found a conflict,
which is indicated by userspace passing back a 1.
Signed-off-by: Abhijith Das <adas redhat com>
Signed-off-by: David Teigland <teigland redhat com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/locking')
| -rw-r--r-- | fs/gfs2/locking/dlm/plock.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c index 1dc76805dd4..fba1f1d87e4 100644 --- a/fs/gfs2/locking/dlm/plock.c +++ b/fs/gfs2/locking/dlm/plock.c @@ -254,16 +254,20 @@ int gdlm_plock_get(void *lockspace, struct lm_lockname *name, } spin_unlock(&ops_lock); + /* info.rv from userspace is 1 for conflict, 0 for no-conflict, + -ENOENT if there are no locks on the file */ + rv = op->info.rv; fl->fl_type = F_UNLCK; if (rv == -ENOENT) rv = 0; - else if (rv == 0 && op->info.pid != fl->fl_pid) { + else if (rv > 0) { fl->fl_type = (op->info.ex) ? F_WRLCK : F_RDLCK; fl->fl_pid = op->info.pid; fl->fl_start = op->info.start; fl->fl_end = op->info.end; + rv = 0; } kfree(op); |