[Cluster-devel] cluster/gfs-kernel/src/nolock main.c

[teigland at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	teigland at sourceware.org	2006-06-26 21:27:43

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&only_with_tag=STABLE&r1=1.4.6.2&r2=1.4.6.2.2.1

--- cluster/gfs-kernel/src/nolock/main.c	2005/04/26 18:32:37	1.4.6.2
+++ cluster/gfs-kernel/src/nolock/main.c	2006/06/26 21:27:43	1.4.6.2.2.1
@@ -243,13 +243,14 @@
 		 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;