From: Al Viro Date: Mon, 25 Jan 2010 23:30:38 +0000 (-0500) Subject: Don't bother with d_genocide in rpc_pipe X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fc7bed8c802de3b064a56a43ec8574aa8d412de3;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Don't bother with d_genocide in rpc_pipe kill_litter_super() from ->kill_sb() will take care of the junk --- diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 49278f830367..9ac493fcc873 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