[Cluster-devel] [PATCH] GFS2: return conflicts for GETLK
David Teigland
teigland at redhat.com
Fri Jun 8 22:01:40 UTC 2007
We weren't returning the correct result when GETLK found a conflict,
which is indicated by userspace passing back a 1.
(Typo in the previous post of this patch.)
Signed-off-by: Abhijith Das <adas redhat com>
Signed-off-by: David Teigland <teigland redhat com>
Index: linux-quilt/fs/gfs2/locking/dlm/plock.c
===================================================================
--- linux-quilt.orig/fs/gfs2/locking/dlm/plock.c 2007-06-08 15:26:03.000000000 -0500
+++ linux-quilt/fs/gfs2/locking/dlm/plock.c 2007-06-08 16:59:54.000000000 -0500
@@ -254,16 +254,20 @@
}
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);
More information about the Cluster-devel
mailing list