From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 26 Jun 2006 21:21:47 -0000
Subject: [Cluster-devel] cluster/gfs-kernel/src/nolock main.c
Message-ID: <20060626212147.23881.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	2006-06-26 21:21:46

Modified files:
	gfs-kernel/src/nolock: main.c 

Log message:
	posix_test_lock() args updated for 2.6.17

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/nolock/main.c.diff?cvsroot=cluster&r1=1.13&r2=1.14

--- cluster/gfs-kernel/src/nolock/main.c	2006/01/09 21:27:28	1.13
+++ cluster/gfs-kernel/src/nolock/main.c	2006/06/26 21:21:46	1.14
@@ -182,13 +182,14 @@
 static int nolock_plock_get(lm_lockspace_t *lockspace, struct lm_lockname *name,
 			    struct file *file, struct file_lock *fl)
 {
-	struct file_lock *tmp;
+	struct file_lock tmp;
+	int ret;
 
 	lock_kernel();
-	tmp = posix_test_lock(file, fl);
+	ret = posix_test_lock(file, fl, &tmp);
 	fl->fl_type = F_UNLCK;
-	if (tmp)
-		memcpy(fl, tmp, sizeof(struct file_lock));
+	if (ret)
+		memcpy(fl, &tmp, sizeof(struct file_lock));
 	unlock_kernel();
 
 	return 0;