fix isofs d_op handling

switch to ->s_d_op; d_obtain_alias() will DTRT now

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 7 insertions, 8 deletions

diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 844a7903c72f..a0f3833c0dbf 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -939,17 +939,18 @@ root_found:
                 goto out_iput;
         }
 
-        /* get the root dentry */
-        s->s_root = d_alloc_root(inode);
-        if (!(s->s_root))
-                goto out_no_root;
-
         table = 0;
         if (joliet_level)
                 table += 2;
         if (opt.check == 'r')
                 table++;
-        d_set_d_op(s->s_root, &isofs_dentry_ops[table]);
+
+        s->s_d_op = &isofs_dentry_ops[table];
+
+        /* get the root dentry */
+        s->s_root = d_alloc_root(inode);
+        if (!(s->s_root))
+                goto out_no_root;
 
         kfree(opt.iocharset);
 
diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
index 679a849c3b27..4fb3e8074fd4 100644
--- a/fs/isofs/namei.c
+++ b/fs/isofs/namei.c
@@ -172,8 +172,6 @@ struct dentry *isofs_lookup(struct inode *dir, struct dentry *dentry, struct nam
         struct inode *inode;
         struct page *page;
 
-        d_set_d_op(dentry, dir->i_sb->s_root->d_op);
-
         page = alloc_page(GFP_USER);
         if (!page)
                 return ERR_PTR(-ENOMEM);