The patch titled
eCryptfs: CIFS nlink fixes
has been added to the -mm tree. Its filename is
ecryptfs-cifs-nlink-fixes.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: eCryptfs: CIFS nlink fixes
From: Michael Halcrow <mhalcrow@xxxxxxxxxx>
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 <mhalcrow@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ecryptfs/dentry.c | 6 ++++++
fs/ecryptfs/inode.c | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff -puN fs/ecryptfs/dentry.c~ecryptfs-cifs-nlink-fixes fs/ecryptfs/dentry.c
--- a/fs/ecryptfs/dentry.c~ecryptfs-cifs-nlink-fixes
+++ a/fs/ecryptfs/dentry.c
@@ -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;
}
diff -puN fs/ecryptfs/inode.c~ecryptfs-cifs-nlink-fixes fs/ecryptfs/inode.c
--- a/fs/ecryptfs/inode.c~ecryptfs-cifs-nlink-fixes
+++ a/fs/ecryptfs/inode.c
@@ -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 inode
lock_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);
_
Patches currently in -mm which might be from mhalcrow@xxxxxxxxxx are
ecryptfs-dput-lower-d_parent-on-rename.patch
ecryptfs-cifs-nlink-fixes.patch
fsstack-introduce-fsstack_copy_attrinode_.patch
fsstack-introduce-fsstack_copy_attrinode_-tidy.patch
ecryptfs-use-fsstacks-generic-copy-inode-attr.patch
ecryptfs-use-fsstacks-generic-copy-inode-attr-tidy-fix.patch
struct-path-make-ecryptfs-a-user-of-struct-path.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
