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;
 	}