Unionfs: use d_set_d_op

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 3cbde56a48e91e2aca4d2191472061eb187d2f13..9040394adec5eb3744e401ee78ccc0f662fe7ae2 100644 (file)
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -311,7 +311,8 @@ struct dentry *unionfs_lookup_full(struct dentry *dentry,
        verify_locked(parent);
 
        /* must initialize dentry operations */
-       dentry->d_op = &unionfs_dops;
+       if (lookupmode == INTERPOSE_LOOKUP)
+               d_set_d_op(dentry, &unionfs_dops);
 
        /* We never partial lookup the root directory. */
        if (IS_ROOT(dentry))

diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index fa52f61178963de137cedafb9026ae8a212c8a36..f4bcd89498612644651d46f9966657dcee14dfda 100644 (file)
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -145,7 +145,7 @@ skip:
                         * properly.  Finally we must return this new
                         * dentry.
                         */
-                       spliced->d_op = &unionfs_dops;
+                       d_set_d_op(spliced, &unionfs_dops);
                        spliced->d_fsdata = dentry->d_fsdata;
                        dentry->d_fsdata = NULL;
                        dentry = spliced;
@@ -543,7 +543,7 @@ static struct dentry *unionfs_d_alloc_root(struct super_block *sb)
 
                ret = d_alloc(NULL, &name);
                if (likely(ret)) {
-                       ret->d_op = &unionfs_dops;
+                       d_set_d_op(ret, &unionfs_dops);
                        ret->d_sb = sb;
                        ret->d_parent = ret;
                }