Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / fs / isofs / inode.c

diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 844a7903c72f7dd9b0013171e1ff9492324f0c15..a0f3833c0dbf578ae0f6477007ae443eae9b728b 100644 (file)
--- 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);