From: Stanislav Kinsbursky <skinsbursky@parallels.com>
To: Trond.Myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
devel@openvz.org
Subject: [PATCH 01/10] NFS: pass net to nfs_callback_down()
Date: Thu, 26 Apr 2012 19:54:59 +0400 [thread overview]
Message-ID: <20120426155459.3763.16742.stgit@localhost6.localdomain6> (raw)
In-Reply-To: <20120426155250.3763.98748.stgit@localhost6.localdomain6>
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
fs/nfs/callback.c | 4 ++--
fs/nfs/callback.h | 2 +-
fs/nfs/client.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index cff3940..d5bb1ae 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -322,7 +322,7 @@ out_err:
/*
* Kill the callback thread if it's no longer being used.
*/
-void nfs_callback_down(int minorversion)
+void nfs_callback_down(int minorversion, struct net *net)
{
struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
@@ -330,7 +330,7 @@ void nfs_callback_down(int minorversion)
cb_info->users--;
if (cb_info->users == 0 && cb_info->task != NULL) {
kthread_stop(cb_info->task);
- svc_shutdown_net(cb_info->serv, current->nsproxy->net_ns);
+ svc_shutdown_net(cb_info->serv, net);
svc_exit_thread(cb_info->rqst);
cb_info->serv = NULL;
cb_info->rqst = NULL;
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index a5527c9..6d900cf 100644
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -194,7 +194,7 @@ extern __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy,
struct cb_process_state *cps);
#ifdef CONFIG_NFS_V4
extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt);
-extern void nfs_callback_down(int minorversion);
+extern void nfs_callback_down(int minorversion, struct net *net);
extern int nfs4_validate_delegation_stateid(struct nfs_delegation *delegation,
const nfs4_stateid *stateid);
extern int nfs4_set_callback_sessionid(struct nfs_client *clp);
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index da7b5e4..44cd70f 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -222,7 +222,7 @@ static void nfs4_shutdown_session(struct nfs_client *clp)
static void nfs4_destroy_callback(struct nfs_client *clp)
{
if (__test_and_clear_bit(NFS_CS_CALLBACK, &clp->cl_res_state))
- nfs_callback_down(clp->cl_mvops->minor_version);
+ nfs_callback_down(clp->cl_mvops->minor_version, clp->net);
}
static void nfs4_shutdown_client(struct nfs_client *clp)
next prev parent reply other threads:[~2012-04-26 15:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-26 15:54 [PATCH 00/10] NFS: callback threads containerization Stanislav Kinsbursky
2012-04-26 15:54 ` Stanislav Kinsbursky [this message]
2012-04-26 15:55 ` [PATCH 02/10] NFS: callback service creation function introduced Stanislav Kinsbursky
2012-04-26 15:55 ` [PATCH 03/10] NFS: move per-net callback thread initialization to nfs_callback_up_net() Stanislav Kinsbursky
2012-04-26 15:55 ` [PATCH 04/10] NFS: callback up - transport backchannel cleanup Stanislav Kinsbursky
2012-04-26 15:55 ` [PATCH 05/10] NFS: callback service start function introduced Stanislav Kinsbursky
2012-04-26 15:55 ` [PATCH 06/10] NFS: callback up - users counting cleanup Stanislav Kinsbursky
2012-04-26 15:55 ` [PATCH 07/10] NFS: make nfs_callback_tcpport per network context Stanislav Kinsbursky
2012-04-26 15:55 ` [PATCH 08/10] NFS: make nfs_callback_tcpport6 " Stanislav Kinsbursky
2012-04-26 15:55 ` [PATCH 09/10] NFS; callback per-net usage counting introduced Stanislav Kinsbursky
2012-04-26 15:56 ` [PATCH 10/10] NFS: add debug messages to callback down function Stanislav Kinsbursky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120426155459.3763.16742.stgit@localhost6.localdomain6 \
--to=skinsbursky@parallels.com \
--cc=Trond.Myklebust@netapp.com \
--cc=devel@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome