diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-08 22:15:13 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-20 21:29:35 -0400 |
commit | 48fde701aff662559b38d9a609574068f22d00fe (patch) | |
tree | aa6b203dc671b51d58575b65eb08310ff8309b60 /fs/autofs4/inode.c | |
parent | 6b4231e2f92adbcf96fb2a3fa751d7ca0a61b21f (diff) |
switch open-coded instances of d_make_root() to new helper
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/autofs4/inode.c')
-rw-r--r-- | fs/autofs4/inode.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index 06858d955120..d8dc002e9cc3 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c | |||
@@ -247,12 +247,9 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) | |||
247 | if (!ino) | 247 | if (!ino) |
248 | goto fail_free; | 248 | goto fail_free; |
249 | root_inode = autofs4_get_inode(s, S_IFDIR | 0755); | 249 | root_inode = autofs4_get_inode(s, S_IFDIR | 0755); |
250 | if (!root_inode) | 250 | root = d_make_root(root_inode); |
251 | goto fail_ino; | ||
252 | |||
253 | root = d_alloc_root(root_inode); | ||
254 | if (!root) | 251 | if (!root) |
255 | goto fail_iput; | 252 | goto fail_ino; |
256 | pipe = NULL; | 253 | pipe = NULL; |
257 | 254 | ||
258 | root->d_fsdata = ino; | 255 | root->d_fsdata = ino; |
@@ -317,9 +314,6 @@ fail_fput: | |||
317 | fail_dput: | 314 | fail_dput: |
318 | dput(root); | 315 | dput(root); |
319 | goto fail_free; | 316 | goto fail_free; |
320 | fail_iput: | ||
321 | printk("autofs: get root dentry failed\n"); | ||
322 | iput(root_inode); | ||
323 | fail_ino: | 317 | fail_ino: |
324 | kfree(ino); | 318 | kfree(ino); |
325 | fail_free: | 319 | fail_free: |