diff --git a/[refs] b/[refs]
index 90d96491692e..dbcb3e681488 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12de3b35ea549c5819f287508d7afab0bf3ac44d
+refs/heads/master: 967b9281361481aecf323563886ef972ee88c681
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index 24988f430e4b..b81149eb26e5 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -2025,10 +2025,11 @@ static void nfs4_kill_super(struct super_block *sb)
 
 	if (server->client != NULL && !IS_ERR(server->client))
 		rpc_shutdown_client(server->client);
-	rpciod_down();		/* release rpciod */
 
 	destroy_nfsv4_state(server);
 
+	rpciod_down();
+
 	kfree(server->hostname);
 	kfree(server);
 }