From: andros@netapp.com
To: trond.myklebust@netapp.com
Cc: bfields@redhat.com, linux-nfs@vger.kernel.org,
Andy Adamson <andros@netapp.com>
Subject: [PATCH_V7 06/12] NFS do not clear minor version at nfs_client free
Date: Tue, 4 Jan 2011 15:42:40 -0500 [thread overview]
Message-ID: <1294173766-5573-7-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1294173766-5573-6-git-send-email-andros@netapp.com>
From: Andy Adamson <andros@netapp.com>
Resetting the client minor version operations causes nfs4_destroy_callback
to fail to shutdown the NFSv4.1 callback service.
There is no reason to reset the client minorversion operations when the
nfs_client struct is being freed.
Remove the minorverion reset and rename the function.
Signed-off-by: Andy Adamson <andros@netapp.com>
---
fs/nfs/client.c | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 0870d0d..855add6 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -170,21 +170,17 @@ error_0:
}
#ifdef CONFIG_NFS_V4
-/*
- * Clears/puts all minor version specific parts from an nfs_client struct
- * reverting it to minorversion 0.
- */
-static void nfs4_clear_client_minor_version(struct nfs_client *clp)
-{
#ifdef CONFIG_NFS_V4_1
- if (nfs4_has_session(clp)) {
+static void nfs4_shutdown_session(struct nfs_client *clp)
+{
+ if (nfs4_has_session(clp))
nfs4_destroy_session(clp->cl_session);
- clp->cl_session = NULL;
- }
-
- clp->cl_mvops = nfs_v4_minor_ops[0];
-#endif /* CONFIG_NFS_V4_1 */
}
+#else /* CONFIG_NFS_V4_1 */
+static void nfs4_shutdown_session(struct nfs_client *clp)
+{
+}
+#endif /* CONFIG_NFS_V4_1 */
/*
* Destroy the NFS4 callback service
@@ -199,7 +195,7 @@ static void nfs4_shutdown_client(struct nfs_client *clp)
{
if (__test_and_clear_bit(NFS_CS_RENEWD, &clp->cl_res_state))
nfs4_kill_renewd(clp);
- nfs4_clear_client_minor_version(clp);
+ nfs4_shutdown_session(clp);
nfs4_destroy_callback(clp);
if (__test_and_clear_bit(NFS_CS_IDMAP, &clp->cl_res_state))
nfs_idmap_delete(clp);
--
1.6.6
next prev parent reply other threads:[~2011-01-04 20:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-04 20:42 [PATCH_V7 0/12] NFSv4 find client fix Version 7 andros
2011-01-04 20:42 ` [PATCH_V7 01/12] SUNRPC move svc_drop to caller of svc_process_common andros
2011-01-04 20:42 ` [PATCH_V7 02/12] SUNRPC fix bc_send print andros
2011-01-04 20:42 ` [PATCH_V7 03/12] SUNRPC new transport for the NFSv4.1 shared back channel andros
2011-01-04 20:42 ` [PATCH_V7 04/12] NFS register and unregister back channel transport andros
2011-01-04 20:42 ` [PATCH_V7 05/12] NFS use svc_create_xprt for NFSv4.1 callback service andros
2011-01-04 20:42 ` andros [this message]
2011-01-04 20:42 ` [PATCH_V7 07/12] NFS implement v4.0 callback_ident andros
2011-01-04 20:42 ` [PATCH_V7 08/12] NFS associate sessionid with callback connection andros
2011-01-04 20:42 ` [PATCH_V7 09/12] NFS refactor nfs_find_client and reference client across callback processing andros
2011-01-04 20:42 ` [PATCH_V7 10/12] NFS RPC_AUTH_GSS unsupported on v4.1 back channel andros
2011-01-04 20:42 ` [PATCH_V7 11/12] NFS add session back channel draining andros
2011-01-04 20:42 ` [PATCH_V7 12/12] NFS rename client back channel transport field andros
2011-01-04 20:57 ` [PATCH_V7 07/12] NFS implement v4.0 callback_ident Trond Myklebust
2011-01-04 21:03 ` Trond Myklebust
2011-01-04 21:47 ` Andy Adamson
2011-01-04 21:55 ` Trond Myklebust
[not found] ` <1294178130.5896.30.camel-rJ7iovZKK19ZJLDQqaL3InhyD016LWXt@public.gmane.org>
2011-01-04 22:11 ` Andy Adamson
2011-01-04 20:53 ` [PATCH_V7 04/12] NFS register and unregister back channel transport Trond Myklebust
[not found] ` <1294174414.5896.13.camel-rJ7iovZKK19ZJLDQqaL3InhyD016LWXt@public.gmane.org>
2011-01-04 21:04 ` Andy Adamson
2011-01-04 21:05 ` J. Bruce Fields
2011-01-04 21:00 ` [PATCH_V7 03/12] SUNRPC new transport for the NFSv4.1 shared back channel J. Bruce Fields
2011-01-04 20:57 ` [PATCH_V7 0/12] NFSv4 find client fix Version 7 J. Bruce Fields
2011-01-04 21:01 ` Andy Adamson
2011-01-04 21:06 ` J. Bruce Fields
2011-01-04 22:12 ` Andy Adamson
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=1294173766-5573-7-git-send-email-andros@netapp.com \
--to=andros@netapp.com \
--cc=bfields@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@netapp.com \
/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).