aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ufs
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/ufs
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/ufs')
-rw-r--r--fs/ufs/super.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index ec25d09fcaa8..f636f6b460d0 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -1164,10 +1164,10 @@ magic_found:
1164 ret = PTR_ERR(inode); 1164 ret = PTR_ERR(inode);
1165 goto failed; 1165 goto failed;
1166 } 1166 }
1167 sb->s_root = d_alloc_root(inode); 1167 sb->s_root = d_make_root(inode);
1168 if (!sb->s_root) { 1168 if (!sb->s_root) {
1169 ret = -ENOMEM; 1169 ret = -ENOMEM;
1170 goto dalloc_failed; 1170 goto failed;
1171 } 1171 }
1172 1172
1173 ufs_setup_cstotal(sb); 1173 ufs_setup_cstotal(sb);
@@ -1181,8 +1181,6 @@ magic_found:
1181 UFSD("EXIT\n"); 1181 UFSD("EXIT\n");
1182 return 0; 1182 return 0;
1183 1183
1184dalloc_failed:
1185 iput(inode);
1186failed: 1184failed:
1187 if (ubh) 1185 if (ubh)
1188 ubh_brelse_uspi (uspi); 1186 ubh_brelse_uspi (uspi);