[Cluster-devel] cluster/group/gfs_controld plock.c

[teigland at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	teigland at sourceware.org	2007-06-08 21:31:56

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&only_with_tag=RHEL5&r1=1.25.2.5&r2=1.25.2.6

--- cluster/group/gfs_controld/plock.c	2006/11/21 17:28:46	1.25.2.5
+++ cluster/group/gfs_controld/plock.c	2007/06/08 21:31:56	1.25.2.6
@@ -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);
 }