rpms/GFS-kernel/FC-5 gfs-kernel-2.6.15-2-kernel-2.6.17.patch, NONE, 1.1 GFS-kernel.spec, 1.157, 1.158

[fedora-cvs-commits at redhat.com]

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23084

Modified Files:
	GFS-kernel.spec 
Added Files:
	gfs-kernel-2.6.15-2-kernel-2.6.17.patch 
Log Message:
Added patch for 2.6.17.

gfs-kernel-2.6.15-2-kernel-2.6.17.patch:
 main.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE gfs-kernel-2.6.15-2-kernel-2.6.17.patch ---
--- gfs-kernel-2.6.15-2/src/nolock/main.c.kernel-2.6.17	2006-06-26 16:23:21.000000000 -0500
+++ gfs-kernel-2.6.15-2/src/nolock/main.c	2006-06-26 16:23:54.000000000 -0500
@@ -243,13 +243,14 @@ nolock_plock_get(lm_lockspace_t *lockspa
 		 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;


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- GFS-kernel.spec	26 Jun 2006 18:45:42 -0000	1.157
+++ GFS-kernel.spec	26 Jun 2006 21:25:22 -0000	1.158
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.25
+Release: 5.FC5.26
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules
@@ -63,7 +63,7 @@
 #ExclusiveArch: i586 i686 x86_64 ppc 
 ExclusiveArch: i686 x86_64
 Source0: gfs-kernel-%{tempversion}-%{subversion}.tar.gz
-
+Patch0: gfs-kernel-2.6.15-2-kernel-2.6.17.patch
 BuildRoot: %{_tmppath}/%{name}-%{tempversion}-%{release}-buildroot
 
 %description
@@ -121,6 +121,7 @@
 ################################################################################
 %prep
 %setup -q -n gfs-kernel-%{tempversion}-%{subversion}
+%patch -p1 -b .kernel-2.6.17
 # Put the version information into the necessary files
 sed  -i -e '/RELEASE_NAME/s/"<CVS>"/"%{version}-%{release}"/' \
 	src/nolock/main.c src/gulm/gulm.h src/gfs/gfs.h src/harness/main.c