From: Trond Myklebust <Trond.Myklebust@netapp.com>
To: andros@netapp.com
Cc: bfields@redhat.com, linux-nfs@vger.kernel.org
Subject: Re: [PATCH_V7 07/12] NFS implement v4.0 callback_ident
Date: Tue, 04 Jan 2011 15:57:53 -0500 [thread overview]
Message-ID: <1294174673.5896.15.camel@heimdal.trondhjem.org> (raw)
In-Reply-To: <1294173766-5573-8-git-send-email-andros@netapp.com>
On Tue, 2011-01-04 at 15:42 -0500, andros@netapp.com wrote:
> From: Andy Adamson <andros@netapp.com>
>
> Provide a unique callback identifier per SETCLIENTID call used to identify the
> v4.0 callback service associated with the clientid.
>
> Do not worry about wrap around. Zero value means unset.
>
> Signed-off-by: Andy Adamson <andros@netapp.com>
> ---
> fs/nfs/nfs4proc.c | 5 +++++
> fs/nfs/nfs4state.c | 1 +
> include/linux/nfs_fs_sb.h | 1 +
> include/linux/nfs_xdr.h | 1 +
> 4 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 78b0899..6652e39 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -3470,6 +3470,8 @@ do_state_recovery:
> return -EAGAIN;
> }
>
> +static u32 current_cb_ident = 1;
> +
> int nfs4_proc_setclientid(struct nfs_client *clp, u32 program,
> unsigned short port, struct rpc_cred *cred,
> struct nfs4_setclientid_res *res)
> @@ -3478,6 +3480,7 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program,
> struct nfs4_setclientid setclientid = {
> .sc_verifier = &sc_verifier,
> .sc_prog = program,
> + .sc_cb_ident = current_cb_ident++,
How about instead using ida_get_new() in order to get a truly unique id
in the range 1..0x7fffffff?
> };
> struct rpc_message msg = {
> .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETCLIENTID],
> @@ -3522,6 +3525,8 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program,
> if (++clp->cl_id_uniquifier == 0)
> break;
> }
> + if (status == NFS_OK)
> + res->cb_ident = setclientid.sc_cb_ident;
> return status;
> }
>
> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
> index f575a31..fe61422 100644
> --- a/fs/nfs/nfs4state.c
> +++ b/fs/nfs/nfs4state.c
> @@ -79,6 +79,7 @@ int nfs4_init_clientid(struct nfs_client *clp, struct rpc_cred *cred)
> if (status != 0)
> goto out;
> clp->cl_clientid = clid.clientid;
> + clp->cl_cb_ident = clid.cb_ident;
> nfs4_schedule_state_renewal(clp);
> out:
> return status;
> diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
> index 452d964..1eaa054 100644
> --- a/include/linux/nfs_fs_sb.h
> +++ b/include/linux/nfs_fs_sb.h
> @@ -71,6 +71,7 @@ struct nfs_client {
> */
> char cl_ipaddr[48];
> unsigned char cl_id_uniquifier;
> + u32 cl_cb_ident; /* v4.0 callback identifier */
> const struct nfs4_minor_version_ops *cl_mvops;
> #endif /* CONFIG_NFS_V4 */
>
> diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
> index 236e7e4..d325def 100644
> --- a/include/linux/nfs_xdr.h
> +++ b/include/linux/nfs_xdr.h
> @@ -869,6 +869,7 @@ struct nfs4_setclientid {
> struct nfs4_setclientid_res {
> u64 clientid;
> nfs4_verifier confirm;
> + u32 cb_ident;
> };
>
> struct nfs4_statfs_arg {
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@netapp.com
www.netapp.com
next prev parent reply other threads:[~2011-01-04 20:57 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 ` [PATCH_V7 06/12] NFS do not clear minor version at nfs_client free andros
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 ` Trond Myklebust [this message]
2011-01-04 21:03 ` [PATCH_V7 07/12] NFS implement v4.0 callback_ident 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=1294174673.5896.15.camel@heimdal.trondhjem.org \
--to=trond.myklebust@netapp.com \
--cc=andros@netapp.com \
--cc=bfields@redhat.com \
--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).