[kernel] r11679 - dists/sid/linux-2.6/debian/patches/features/all/vserver

[Bastian Blank]

Author: waldi
Date: Sun Jun 22 08:14:48 2008
New Revision: 11679

Log:
debian/patches/features/all/vserver/vs2.3.0.34.11.patch: Fix.


Modified:
   dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.34.11.patch

Modified: dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.34.11.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.34.11.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.34.11.patch	Sun Jun 22 08:14:48 2008
@@ -2341,9 +2341,9 @@
  		goto out_lock;
  	rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir->i_sb, 0);
 @@ -428,7 +428,7 @@ static int ecryptfs_unlink(struct inode 
- 	struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir);
+ 	struct dentry *lower_dir_dentry;
  
- 	lock_parent(lower_dentry);
+ 	lower_dir_dentry = lock_parent(lower_dentry);
 -	rc = vfs_unlink(lower_dir_inode, lower_dentry);
 +	rc = vfs_unlink(lower_dir_inode, lower_dentry, NULL);
  	if (rc) {