[Cluster-devel] Re: [PATCH] GFS2: return conflicts for GETLK
Steven Whitehouse
swhiteho at redhat.com
Sat Jun 9 14:33:45 UTC 2007
Hi,
Now added to the GFS2 -nmw git tree. Thanks,
Steve.
On Fri, 2007-06-08 at 17:01 -0500, David Teigland wrote:
> 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