From 27d36113fe95abda369f9ce1d1c073d4ae6565ea Mon Sep 17 00:00:00 2001
From: Andy Adamson <andros@netapp.com>
Date: Wed, 1 Apr 2009 09:23:18 -0400
Subject: [PATCH] --- yaml --- r: 153601 b: refs/heads/master c:
 5a0ffe544c54f62be99751e369f4d0f44bd5ee19 h: refs/heads/master i:   153599:
 031ff737217cc98f495183e2ac2b039a8cc148bd v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfs/nfs4proc.c | 6 ++++++
 trunk/fs/nfs/super.c    | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e4fc301dc10a..8482e62ca1fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 343952fa5aac888934ffc203abed26a823400eb6
+refs/heads/master: 5a0ffe544c54f62be99751e369f4d0f44bd5ee19
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index 4213c8814997..5da939d577d5 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -49,6 +49,7 @@
 #include <linux/namei.h>
 #include <linux/mount.h>
 #include <linux/module.h>
+#include <linux/sunrpc/bc_xprt.h>
 
 #include "nfs4_fs.h"
 #include "delegation.h"
@@ -4481,6 +4482,11 @@ struct nfs4_session *nfs4_alloc_session(struct nfs_client *clp)
 
 void nfs4_destroy_session(struct nfs4_session *session)
 {
+	nfs4_proc_destroy_session(session);
+	dprintk("%s Destroy backchannel for xprt %p\n",
+		__func__, session->clp->cl_rpcclient->cl_xprt);
+	xprt_destroy_backchannel(session->clp->cl_rpcclient->cl_xprt,
+				NFS41_BC_MIN_CALLBACKS);
 	nfs4_destroy_slot_table(session);
 	kfree(session);
 }
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 73db6f8c145a..69804a8245f6 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -2488,7 +2488,6 @@ static void nfs4_kill_super(struct super_block *sb)
 	dprintk("--> %s\n", __func__);
 	nfs_super_return_all_delegations(sb);
 	kill_anon_super(sb);
-
 	nfs4_renewd_prepare_shutdown(server);
 	nfs_fscache_release_super_cookie(sb);
 	nfs_free_server(server);