rpms/kernel/FC-4 linux-2.6-fs-locks-leak.patch, NONE, 1.1 kernel-2.6.spec, 1.1504, 1.1505

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26982

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-fs-locks-leak.patch 
Log Message:
* Mon Nov 14 2005 Dave Jones <davej at redhat.com> 
- Fix memory leak with file leases. (#172691)


linux-2.6-fs-locks-leak.patch:
 locks.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE linux-2.6-fs-locks-leak.patch ---
--- linux-2.6.14/fs/locks.c~	2005-11-14 14:18:45.000000000 -0500
+++ linux-2.6.14/fs/locks.c	2005-11-14 14:19:25.000000000 -0500
@@ -1418,7 +1418,7 @@ int fcntl_setlease(unsigned int fd, stru
 	lock_kernel();
 
 	error = __setlease(filp, arg, &flp);
-	if (error)
+	if (error || arg == F_UNLCK)
 		goto out_unlock;
 
 	error = fasync_helper(fd, filp, 1, &flp->fl_fasync);
--- linux-2.6.14/fs/locks.c~	2005-11-14 14:19:28.000000000 -0500
+++ linux-2.6.14/fs/locks.c	2005-11-14 14:19:36.000000000 -0500
@@ -1093,7 +1093,6 @@ static void time_out_leases(struct inode
 			before = &fl->fl_next;
 			continue;
 		}
-		printk(KERN_INFO "lease broken - owner pid = %d\n", fl->fl_pid);
 		lease_modify(before, fl->fl_type & ~F_INPROGRESS);
 		if (fl == *before)	/* lease_modify may have freed fl */
 			before = &fl->fl_next;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1504
retrieving revision 1.1505
diff -u -r1.1504 -r1.1505
--- kernel-2.6.spec	12 Nov 2005 23:14:56 -0000	1.1504
+++ kernel-2.6.spec	14 Nov 2005 19:21:19 -0000	1.1505
@@ -341,6 +341,8 @@
 Patch1761: linux-2.6-suspend-mxcsr.patch
 Patch1762: linux-2.6-i8k-dmi.patch
 Patch1763: linux-2.6-net-nf_queue-oops.patch
+Patch1764: linux-2.6-fs-locks-leak.patch
+
 
 # ACPI patches.
 Patch1800: linux-2.6-acpi-enable-ecburst.patch
@@ -779,6 +781,8 @@
 %patch1762 -p1
 # nf_queue: Fix Ooops when no queue handler registered
 %patch1763 -p1
+# Fix memory leak with file leases.
+%patch1764 -p1
 
 # ACPI patches.
 # Enable EC burst
@@ -1246,6 +1250,9 @@
 %endif
 
 %changelog
+* Mon Nov 14 2005 Dave Jones <davej at redhat.com> 
+- Fix memory leak with file leases. (#172691)
+
 * Sat Nov 12 2005 Dave Jones <davej at redhat.com> [2.6.14-1.1639_FC4]
 - Ignore result from acpi_bus_find_driver(device);
   Should fix boot hangs on several HP systems (and maybe others).