From mboxrd@z Thu Jan  1 00:00:00 1970
From: adas@sourceware.org <adas@sourceware.org>
Date: 14 Sep 2006 16:00:49 -0000
Subject: [Cluster-devel] cluster/gfs-kernel/src/dlm plock.c
Message-ID: <20060914160049.1542.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
Branch: 	RHEL4
Changes by:	adas at sourceware.org	2006-09-14 16:00:49

Modified files:
	gfs-kernel/src/dlm: plock.c 

Log message:
	fix for bz 206339. Was passing fl_pid instead of fl_owner causing F_GETLK to return conflicts with a process' own locks

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/plock.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.12.2.1&r2=1.12.2.2

--- cluster/gfs-kernel/src/dlm/Attic/plock.c	2006/07/12 21:53:30	1.12.2.1
+++ cluster/gfs-kernel/src/dlm/Attic/plock.c	2006/09/14 16:00:48	1.12.2.2
@@ -1236,7 +1236,7 @@
 
 	ex = (fl->fl_type == F_WRLCK) ? 1 : 0;
 
-	error = do_plock_get(dlm, name, fl->fl_pid, &fl->fl_start,
+	error = do_plock_get(dlm, name, fl->fl_owner, &fl->fl_start,
 			     &fl->fl_end, &ex, &owner, &pid);
 	if (error < 0)
 		return error;