Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GFS2] return conflicts for GETLK

Browse source 
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>
This commit is contained in:
David Teigland 2007-06-08 17:01:40 -05:00 committed by Steven Whitehouse
parent d88101d4d8
commit a7a2ff8a95
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/gfs2/locking/dlm/plock.c
View file

@ -254,16 +254,20 @@ int gdlm_plock_get(void *lockspace, struct lm_lockname *name,
} }
spin_unlock(&ops_lock); 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; rv = op->info.rv;
fl->fl_type = F_UNLCK; fl->fl_type = F_UNLCK;
if (rv == -ENOENT) if (rv == -ENOENT)
rv = 0; 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_type = (op->info.ex) ? F_WRLCK : F_RDLCK;
fl->fl_pid = op->info.pid; fl->fl_pid = op->info.pid;
fl->fl_start = op->info.start; fl->fl_start = op->info.start;
fl->fl_end = op->info.end; fl->fl_end = op->info.end;
rv = 0;
} }
kfree(op); kfree(op);