Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / fs / ecryptfs / dentry.c

diff --git a/fs/ecryptfs/dentry.c b/fs/ecryptfs/dentry.c
index f0d2a43..329efcd 100644 (file)
--- a/fs/ecryptfs/dentry.c
+++ b/fs/ecryptfs/dentry.c
@@ -24,6 +24,8 @@
 
 #include <linux/dcache.h>
 #include <linux/namei.h>
+#include <linux/mount.h>
+#include <linux/fs_stack.h>
 #include "ecryptfs_kernel.h"
 
 /**
@@ -56,6 +58,12 @@ static int ecryptfs_d_revalidate(struct dentry *dentry, struct nameidata *nd)
        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);
+
+               fsstack_copy_attr_all(dentry->d_inode, lower_inode, NULL);
+       }
 out:
        return rc;
 }
@@ -76,8 +84,13 @@ static void ecryptfs_d_release(struct dentry *dentry)
        if (ecryptfs_dentry_to_private(dentry))
                kmem_cache_free(ecryptfs_dentry_info_cache,
                                ecryptfs_dentry_to_private(dentry));
-       if (lower_dentry)
+       if (lower_dentry) {
+               struct vfsmount *lower_mnt =
+                       ecryptfs_dentry_to_lower_mnt(dentry);
+
+               mntput(lower_mnt);
                dput(lower_dentry);
+       }
        return;
 }