- up for 2.6.25.7

[packages/kernel.git] / kernel-vserver-2.3.patch

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index dadc1649765d82cdeb18cf1b91f1f6c72a293ab4..5e03d52cf8401d943d92db0e5faa1c31803a8fb1 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -2447,9 +2447,9 @@ diff -NurpP --minimal linux-2.6.25.4/fs/ecryptfs/inode.c linux-2.6.25.4-vs2.3.0.
                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) {
@@ -26425,8 +26425,8 @@ diff -NurpP --minimal linux-2.6.25.4/Makefile linux-2.6.25.4-vs2.3.0.34.10/Makef
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 25
--EXTRAVERSION = .6
-+EXTRAVERSION = .6-vs2.3.x-vs2.3.0.34.11
+-EXTRAVERSION = .7
++EXTRAVERSION = .7-vs2.3.x-vs2.3.0.34.11
  NAME = Funky Weasel is Jiggy wit it
  
  # *DOCUMENTATION*