Gitweb: http://git.kernel.org/linus/5a0ffe544c54f62be99751e369f4d0f44bd5ee19
Commit: 5a0ffe544c54f62be99751e369f4d0f44bd5ee19
Parent: 343952fa5aac888934ffc203abed26a823400eb6
Author: Andy Adamson <andros@netapp.com>
AuthorDate: Wed Apr 1 09:23:18 2009 -0400
Committer: Benny Halevy <bhalevy@panasas.com>
CommitDate: Wed Jun 17 14:11:34 2009 -0700
nfs41: Release backchannel resources associated with session
Frees the preallocated backchannel resources that are associated with
this session when the session is destroyed.
A backchannel is currently created once per session. Destroy the backchannel
only when the session is destroyed.
Signed-off-by: Ricardo Labiaga <ricardo.labiaga@netapp.com>
Signed-off-by: Andy Adamson<andros@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
---
fs/nfs/nfs4proc.c | 6 ++++++
fs/nfs/super.c | 1 -
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 4213c88..5da939d 100644
--- a/fs/nfs/nfs4proc.c
+++ b/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/fs/nfs/super.c b/fs/nfs/super.c
index 73db6f8..69804a8 100644
--- a/fs/nfs/super.c
+++ b/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);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
