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 /net | |
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 'net')
-rw-r--r-- | net/sunrpc/rpc_pipe.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 63a7a7add21e..7d6dd6efbdbe 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -1033,13 +1033,9 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) | |||
1033 | sb->s_time_gran = 1; | 1033 | sb->s_time_gran = 1; |
1034 | 1034 | ||
1035 | inode = rpc_get_inode(sb, S_IFDIR | 0755); | 1035 | inode = rpc_get_inode(sb, S_IFDIR | 0755); |
1036 | if (!inode) | 1036 | sb->s_root = root = d_make_root(inode); |
1037 | return -ENOMEM; | 1037 | if (!root) |
1038 | sb->s_root = root = d_alloc_root(inode); | ||
1039 | if (!root) { | ||
1040 | iput(inode); | ||
1041 | return -ENOMEM; | 1038 | return -ENOMEM; |
1042 | } | ||
1043 | if (rpc_populate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF, NULL)) | 1039 | if (rpc_populate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF, NULL)) |
1044 | return -ENOMEM; | 1040 | return -ENOMEM; |
1045 | return 0; | 1041 | return 0; |