Merge branch 'for-linus' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / fs / ecryptfs / dentry.c

diff --git a/fs/ecryptfs/dentry.c b/fs/ecryptfs/dentry.c
index 841a032050a7fd84f5175fea918e62ba4f879ae1..2dda5ade75bc78a06461d0b62fbb9f74bde28678 100644 (file)
--- a/fs/ecryptfs/dentry.c
+++ b/fs/ecryptfs/dentry.c
@@ -80,8 +80,8 @@ static void ecryptfs_d_release(struct dentry *dentry)
 {
        if (ecryptfs_dentry_to_private(dentry)) {
                if (ecryptfs_dentry_to_lower(dentry)) {
-                       mntput(ecryptfs_dentry_to_lower_mnt(dentry));
                        dput(ecryptfs_dentry_to_lower(dentry));
+                       mntput(ecryptfs_dentry_to_lower_mnt(dentry));
                }
                kmem_cache_free(ecryptfs_dentry_info_cache,
                                ecryptfs_dentry_to_private(dentry));
@@ -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,
 };