eCryptfs: CIFS nlink fixes
PATCH 1/1 eCryptfs: CIFS nlink fixes
When CIFS is the lower filesystem, the old lower dentry needs to be explicitly dropped from inside eCryptfs to force a revalidate. In addition, when CIFS is the lower filesystem, the inode attributes need to be copied back up from the lower inode to the eCryptfs inode on an eCryptfs revalidate.
Signed-off-by Michael Halcrow <[email protected]>
---
fs/ecryptfs/dentry.c | 6 ++++++ fs/ecryptfs/inode.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-)
ddef902c356e65e01e8ca3f2cc073613e8fffdec
fs/ecryptfs/dentry.c +6 -0
@@ -57,6 +57,12 @@ static int ecryptfs_d_revalidate(struct rc = lower_dentry->d_op->d_revalidate (lower_dentry, nd); nd->dentry = dentry_save; nd->mnt = vfsmount_save; +if (dentry->d_inode) { +struct inode *lower_inode = +ecryptfs_inode_to_lower (dentry->d_inode); + +ecryptfs_copy_attr_all (dentry->d_inode, lower_inode); + } out:return rc; }
fs/ecryptfs/inode.c +2 -1
@@ -470,6 +470,7 @@ out_lock:unlock_dir (lower_dir_dentry);dput (lower_new_dentry);dput (lower_old_dentry); +d_drop (lower_old_dentry);d_drop (new_dentry);d_drop (old_dentry);return rc;
@@ -484,7 +485,7 @@ static int ecryptfs_unlink(struct inodelock_parent (lower_dentry); rc =vfs_unlink (lower_dir_inode, lower_dentry);if (rc) { -ecryptfs_printk (KERN_ERR ,"Error in vfs_unlink\n" ); +printk (KERN_ERR "Error in vfs_unlink; rc = [%d]\n" , rc); goto out_unlock; }ecryptfs_copy_attr_times (dir, lower_dir_inode);
Signature · 1 line
1.3.3