[kernel] r6557 - dists/sid/linux-2.6/debian/patches

[Bastian Blank]

Author: waldi
Date: Thu May 11 10:32:45 2006
New Revision: 6557

Modified:
   dists/sid/linux-2.6/debian/patches/vserver-vs2.0.2-rc19.patch

Log:
debian/patches/vserver-vs2.0.2-rc19.patch: Fix patch to apply on top of 2.6.16.16.


Modified: dists/sid/linux-2.6/debian/patches/vserver-vs2.0.2-rc19.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/vserver-vs2.0.2-rc19.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/vserver-vs2.0.2-rc19.patch	Thu May 11 10:32:45 2006
@@ -4013,7 +4013,7 @@
  	return 0;
 @@ -457,6 +470,11 @@ static int lease_alloc(struct file *filp
  	if (fl == NULL)
- 		return -ENOMEM;
+ 		goto out;
  
 +	fl->fl_xid = vx_current_xid();
 +	if (filp)
@@ -4021,8 +4021,8 @@
 +			"f_xid(%d) == fl_xid(%d)", filp->f_xid, fl->fl_xid);
 +	vx_locks_inc(fl);
  	error = lease_init(filp, type, fl);
- 	if (error)
- 		return error;
+ 	if (error) {
+ 		locks_free_lock(fl);
 @@ -771,7 +789,7 @@ out:
  
  EXPORT_SYMBOL(posix_lock_file);