From 4579cdfc53c6180f9c1ff8f99b54d59e8a50bb73 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 25 Jan 2010 18:30:38 -0500
Subject: [PATCH] --- yaml --- r: 185705 b: refs/heads/master c:
 fc7bed8c802de3b064a56a43ec8574aa8d412de3 h: refs/heads/master i:   185703:
 cb6d78c5e8ca881adb378e0f9b03f228e1903685 v: v3

---
 [refs]                      | 2 +-
 trunk/net/sunrpc/rpc_pipe.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c64c38737bd6..02569c464704 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b7e934d887c67fe093b61f1308bc2d9c49381ff
+refs/heads/master: fc7bed8c802de3b064a56a43ec8574aa8d412de3
diff --git a/trunk/net/sunrpc/rpc_pipe.c b/trunk/net/sunrpc/rpc_pipe.c
index 49278f830367..9ac493fcc873 100644
--- a/trunk/net/sunrpc/rpc_pipe.c
+++ b/trunk/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