From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 8 Jun 2007 21:30:54 -0000
Subject: [Cluster-devel] cluster/group/gfs_controld plock.c
Message-ID: <20070608213054.27621.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2007-06-08 21:30:54

Modified files:
	group/gfs_controld: plock.c 

Log message:
	Return 1 or 0 GETLK result to the kernel for conflict/no-conflict.
	We were always returning 0 before.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/plock.c.diff?cvsroot=cluster&r1=1.30&r2=1.31

--- cluster/group/gfs_controld/plock.c	2006/11/21 17:28:09	1.30
+++ cluster/group/gfs_controld/plock.c	2007/06/08 21:30:54	1.31
@@ -915,9 +915,9 @@
 		goto out;
 
 	if (is_conflict(r, in, 1))
-		in->rv = 1;
+		rv = 1;
 	else
-		in->rv = 0;
+		rv = 0;
  out:
 	write_result(mg, in, rv);
 }