diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-12-18 10:29:26 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-12 20:02:43 -0500 |
commit | 6cc9c1d2c1414ef67f465462aa96a5d1fed12f5d (patch) | |
tree | 5753c48ee75430f442703bb06922de461a52bf6c /fs/isofs | |
parent | c8aebb0c9f8c7471643d5f8ba68328de8013005f (diff) |
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>
Diffstat (limited to 'fs/isofs')
-rw-r--r-- | fs/isofs/inode.c | 13 | ||||
-rw-r--r-- | fs/isofs/namei.c | 2 |
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: | |||
939 | goto out_iput; | 939 | goto out_iput; |
940 | } | 940 | } |
941 | 941 | ||
942 | /* get the root dentry */ | ||
943 | s->s_root = d_alloc_root(inode); | ||
944 | if (!(s->s_root)) | ||
945 | goto out_no_root; | ||
946 | |||
947 | table = 0; | 942 | table = 0; |
948 | if (joliet_level) | 943 | if (joliet_level) |
949 | table += 2; | 944 | table += 2; |
950 | if (opt.check == 'r') | 945 | if (opt.check == 'r') |
951 | table++; | 946 | table++; |
952 | d_set_d_op(s->s_root, &isofs_dentry_ops[table]); | 947 | |
948 | s->s_d_op = &isofs_dentry_ops[table]; | ||
949 | |||
950 | /* get the root dentry */ | ||
951 | s->s_root = d_alloc_root(inode); | ||
952 | if (!(s->s_root)) | ||
953 | goto out_no_root; | ||
953 | 954 | ||
954 | kfree(opt.iocharset); | 955 | kfree(opt.iocharset); |
955 | 956 | ||
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 | |||
172 | struct inode *inode; | 172 | struct inode *inode; |
173 | struct page *page; | 173 | struct page *page; |
174 | 174 | ||
175 | d_set_d_op(dentry, dir->i_sb->s_root->d_op); | ||
176 | |||
177 | page = alloc_page(GFP_USER); | 175 | page = alloc_page(GFP_USER); |
178 | if (!page) | 176 | if (!page) |
179 | return ERR_PTR(-ENOMEM); | 177 | return ERR_PTR(-ENOMEM); |