diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-01-25 18:30:38 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-03 14:07:54 -0500 |
| commit | fc7bed8c802de3b064a56a43ec8574aa8d412de3 (patch) | |
| tree | 8f4836dd8db3f6748bd813b1f746af6fa6328859 /net/sunrpc | |
| parent | 5b7e934d887c67fe093b61f1308bc2d9c49381ff (diff) | |
| download | linux-3.10-fc7bed8c802de3b064a56a43ec8574aa8d412de3.tar.gz linux-3.10-fc7bed8c802de3b064a56a43ec8574aa8d412de3.tar.bz2 linux-3.10-fc7bed8c802de3b064a56a43ec8574aa8d412de3.zip | |
Don't bother with d_genocide in rpc_pipe
kill_litter_super() from ->kill_sb() will take care of the junk
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/rpc_pipe.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 49278f83036..9ac493fcc87 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c @@ -999,19 +999,14 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) inode = rpc_get_inode(sb, S_IFDIR | 0755); if (!inode) return -ENOMEM; - root = d_alloc_root(inode); + sb->s_root = root = d_alloc_root(inode); if (!root) { iput(inode); return -ENOMEM; } if (rpc_populate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF, NULL)) - goto out; - sb->s_root = root; + return -ENOMEM; return 0; -out: - d_genocide(root); - dput(root); - return -ENOMEM; } static int |