aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-01-08 22:15:13 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-03-20 21:29:35 -0400
commit48fde701aff662559b38d9a609574068f22d00fe (patch)
treeaa6b203dc671b51d58575b65eb08310ff8309b60 /fs/xfs
parent6b4231e2f92adbcf96fb2a3fa751d7ca0a61b21f (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/xfs')
-rw-r--r--fs/xfs/xfs_super.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 0e4c5c017fba..baf40e378d35 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1362,10 +1362,10 @@ xfs_fs_fill_super(
1362 error = EINVAL; 1362 error = EINVAL;
1363 goto out_syncd_stop; 1363 goto out_syncd_stop;
1364 } 1364 }
1365 sb->s_root = d_alloc_root(root); 1365 sb->s_root = d_make_root(root);
1366 if (!sb->s_root) { 1366 if (!sb->s_root) {
1367 error = ENOMEM; 1367 error = ENOMEM;
1368 goto out_iput; 1368 goto out_syncd_stop;
1369 } 1369 }
1370 1370
1371 return 0; 1371 return 0;
@@ -1384,8 +1384,6 @@ xfs_fs_fill_super(
1384 out: 1384 out:
1385 return -error; 1385 return -error;
1386 1386
1387 out_iput:
1388 iput(root);
1389 out_syncd_stop: 1387 out_syncd_stop:
1390 xfs_syncd_stop(mp); 1388 xfs_syncd_stop(mp);
1391 out_unmount: 1389 out_unmount: