diff --git a/kernel-patches/2.6.28/vfs-unlink.diff b/kernel-patches/2.6.28/vfs-unlink.diff index ee82d2781..093774a53 100644 --- a/kernel-patches/2.6.28/vfs-unlink.diff +++ b/kernel-patches/2.6.28/vfs-unlink.diff @@ -11,11 +11,11 @@ Signed-off-by: John Johansen --- fs/ecryptfs/inode.c | 3 ++- fs/namei.c | 4 ++-- - fs/nfsd/nfs4recover.c | 2 +- + fs/nfsd/nfs4recover.c | 4 ++-- fs/nfsd/vfs.c | 2 +- include/linux/fs.h | 2 +- ipc/mqueue.c | 2 +- - 6 files changed, 8 insertions(+), 7 deletions(-) + 6 files changed, 9 insertions(+), 8 deletions(-) --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -60,7 +60,16 @@ Signed-off-by: John Johansen } mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT); - status = vfs_unlink(dir->d_inode, dentry); -+ status = vfs_unlink(dir->d_inode, dentry, rec_dir.path.mnt); ++ status = vfs_unlink(dir->d_inode, dentry, rec_dir.mnt); + mutex_unlock(&dir->d_inode->i_mutex); + return status; + } +@@ -279,7 +279,7 @@ nfsd4_clear_clid_dir(struct dentry *dir, + * a kernel from the future.... */ + nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file); + mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT); +- status = vfs_rmdir(dir->d_inode, dentry, rec_dir.path.mnt); ++ status = vfs_rmdir(dir->d_inode, dentry, rec_dir.mnt); mutex_unlock(&dir->d_inode->i_mutex); return status; }