From a6311eba0d52873693fabeb46be02de4e27a8e02 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 16 Jun 2008 21:09:08 +0000 Subject: [PATCH] - up for 2.6.25.7 Changed files: kernel-vserver-2.3.patch -> 1.2.4.11.2.33 linux-2.6-vs2.3.patch -> 1.2.4.11.2.33 --- kernel-vserver-2.3.patch | 8 ++++---- linux-2.6-vs2.3.patch | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index dadc1649..5e03d52c 100644 --- 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* diff --git a/linux-2.6-vs2.3.patch b/linux-2.6-vs2.3.patch index dadc1649..5e03d52c 100644 --- a/linux-2.6-vs2.3.patch +++ b/linux-2.6-vs2.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* -- 2.44.0