nfsd4: reshuffle lease-setting code to allow reuse

[safe/jmp/linux-2.6] / fs / ecryptfs / dentry.c

diff --git a/fs/ecryptfs/dentry.c b/fs/ecryptfs/dentry.c
index 5e59658..8f006a0 100644 (file)
--- a/fs/ecryptfs/dentry.c
+++ b/fs/ecryptfs/dentry.c
@@ -62,7 +62,7 @@ static int ecryptfs_d_revalidate(struct dentry *dentry, struct nameidata *nd)
                struct inode *lower_inode =
                        ecryptfs_inode_to_lower(dentry->d_inode);
 
-               fsstack_copy_attr_all(dentry->d_inode, lower_inode, NULL);
+               fsstack_copy_attr_all(dentry->d_inode, lower_inode);
        }
 out:
        return rc;
@@ -89,7 +89,7 @@ static void ecryptfs_d_release(struct dentry *dentry)
        return;
 }
 
-struct dentry_operations ecryptfs_dops = {
+const struct dentry_operations ecryptfs_dops = {
        .d_revalidate = ecryptfs_d_revalidate,
        .d_release = ecryptfs_d_release,
 };