linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
To: Trond.Myklebust@netapp.com
Cc: bfields@fieldses.org, linux-nfs@vger.kernel.org,
	linux-kernel@vger.kernel.org, devel@openvz.org
Subject: [PATCH v4 01/10] NFS: pass net to nfs_callback_down()
Date: Mon, 20 Aug 2012 18:00:06 +0400	[thread overview]
Message-ID: <20120820140006.17404.54487.stgit@localhost.localdomain> (raw)
In-Reply-To: <20120820134734.17404.53946.stgit@localhost.localdomain>

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
 fs/nfs/callback.c   |    4 ++--
 fs/nfs/callback.h   |    2 +-
 fs/nfs/nfs4client.c |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 4c8459e..51297b2 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -301,7 +301,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];
 
@@ -309,7 +309,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, &init_net);
+		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 b44d7b1..3094044 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);
 #if IS_ENABLED(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/nfs4client.c b/fs/nfs/nfs4client.c
index b895629..1dfaa13 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -85,7 +85,7 @@ error:
 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, &init_net);
 }
 
 static void nfs4_shutdown_client(struct nfs_client *clp)


  reply	other threads:[~2012-08-20 14:02 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-20 13:59 [PATCH v4 00/10] NFS: callback threads containerization Stanislav Kinsbursky
2012-08-20 14:00 ` Stanislav Kinsbursky [this message]
2012-08-20 14:00 ` [PATCH v4 02/10] NFS: callback service creation function introduced Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 03/10] NFS: move per-net callback thread initialization to nfs_callback_up_net() Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 04/10] NFS: callback up - transport backchannel cleanup Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 05/10] NFS: callback service start function introduced Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 06/10] NFS: callback up - users counting cleanup Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 07/10] NFS: make nfs_callback_tcpport per network context Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 08/10] NFS: make nfs_callback_tcpport6 " Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 09/10] NFS: callback per-net usage counting introduced Stanislav Kinsbursky
2012-08-20 14:00 ` [PATCH v4 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=20120820140006.17404.54487.stgit@localhost.localdomain \
    --to=skinsbursky@parallels.com \
    --cc=Trond.Myklebust@netapp.com \
    --cc=bfields@fieldses.org \
    --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;
as well as URLs for NNTP newsgroup(s).