From ac0288cc5b124f79407257efeaa3833a2a717358 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Thu, 22 Dec 2011 18:22:49 -0700
Subject: [PATCH] --- yaml --- r: 284647 b: refs/heads/master c:
 61c8504c428edcebf23b97775a129c5b393a302b h: refs/heads/master i:   284645:
 85e537711b05e4e2c35f84b62237680494fe9769   284643:
 cf0ab638e03097a6d49e18bb3ae4ae25ca69fd30   284639:
 7b2b9a4949a2d8aeff6d7605828d57ed90df543c v: v3

---
 [refs]                 | 2 +-
 trunk/net/sunrpc/svc.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b4eda34d2e0c..1af193cb6ca6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8548894bde94ccee836e210274ff401225e9733
+refs/heads/master: 61c8504c428edcebf23b97775a129c5b393a302b
diff --git a/trunk/net/sunrpc/svc.c b/trunk/net/sunrpc/svc.c
index e9632bb66535..1dd5fd014559 100644
--- a/trunk/net/sunrpc/svc.c
+++ b/trunk/net/sunrpc/svc.c
@@ -167,6 +167,7 @@ svc_pool_map_alloc_arrays(struct svc_pool_map *m, unsigned int maxpools)
 
 fail_free:
 	kfree(m->to_pool);
+	m->to_pool = NULL;
 fail:
 	return -ENOMEM;
 }
@@ -287,7 +288,9 @@ svc_pool_map_put(void)
 	if (!--m->count) {
 		m->mode = SVC_POOL_DEFAULT;
 		kfree(m->to_pool);
+		m->to_pool = NULL;
 		kfree(m->pool_to);
+		m->pool_to = NULL;
 		m->npools = 0;
 	}