From: "J. Bruce Fields" <bfields@fieldses.org>
To: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: andros@netapp.com, bfields@redhat.com, linux-nfs@vger.kernel.org
Subject: Re: [PATCH_V7 04/12] NFS register and unregister back channel transport
Date: Tue, 4 Jan 2011 16:05:50 -0500 [thread overview]
Message-ID: <20110104210549.GC7908@fieldses.org> (raw)
In-Reply-To: <1294174414.5896.13.camel-rJ7iovZKK19ZJLDQqaL3InhyD016LWXt@public.gmane.org>
On Tue, Jan 04, 2011 at 03:53:33PM -0500, Trond Myklebust wrote:
> On Tue, 2011-01-04 at 15:42 -0500, andros@netapp.com wrote:
> > From: Andy Adamson <andros@netapp.com>
> >
> > Signed-off-by: Andy Adamson <andros@netapp.com>
> > ---
> > fs/nfs/callback.c | 20 +++++++++++++++++++-
> > fs/nfs/callback.h | 2 ++
> > fs/nfs/inode.c | 4 ++++
> > include/linux/sunrpc/svcsock.h | 3 ++-
> > net/sunrpc/svcsock.c | 13 +++++++++++++
> > 5 files changed, 40 insertions(+), 2 deletions(-)
> >
> > diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
> > index 93a8b3b..241ab70 100644
> > --- a/fs/nfs/callback.c
> > +++ b/fs/nfs/callback.c
> > @@ -221,7 +221,17 @@ static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
> > if (minorversion)
> > xprt->bc_serv = cb_info->serv;
> > }
> > -#else
> > +
> > +void nfs_init_bc_xprt(void)
> > +{
> > + svc_init_bc_xprt_sock();
> > +}
> > +
> > +void nfs_cleanup_bc_xprt(void)
> > +{
> > + svc_cleanup_bc_xprt_sock();
> > +}
> > +#else /* CONFIG_NFS_V4_1 */
> > static inline int nfs_minorversion_callback_svc_setup(u32 minorversion,
> > struct svc_serv *serv, struct rpc_xprt *xprt,
> > struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
> > @@ -233,6 +243,14 @@ static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
> > struct nfs_callback_data *cb_info)
> > {
> > }
> > +
> > +void nfs_init_bc_xprt(void)
> > +{
> > +}
> > +
> > +void nfs_cleanup_bc_xprt(void)
> > +{
> > +}
> > #endif /* CONFIG_NFS_V4_1 */
> >
> > /*
> > diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
> > index 85a7cfd..9206a2d 100644
> > --- a/fs/nfs/callback.h
> > +++ b/fs/nfs/callback.h
> > @@ -149,5 +149,7 @@ extern int nfs4_validate_delegation_stateid(struct nfs_delegation *delegation,
> > extern unsigned int nfs_callback_set_tcpport;
> > extern unsigned short nfs_callback_tcpport;
> > extern unsigned short nfs_callback_tcpport6;
> > +extern void nfs_init_bc_xprt(void);
> > +extern void nfs_cleanup_bc_xprt(void);
> >
> > #endif /* __LINUX_FS_NFS_CALLBACK_H */
> > diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
> > index e67e31c..28afea2 100644
> > --- a/fs/nfs/inode.c
> > +++ b/fs/nfs/inode.c
> > @@ -1571,6 +1571,9 @@ static int __init init_nfs_fs(void)
> > #endif
> > if ((err = register_nfs_fs()) != 0)
> > goto out;
> > +
> > + nfs_init_bc_xprt();
> > +
>
> I'm not sure that I understand. Why would we want to do this in the NFS
> layer? Doesn't the above just belong in svc_init_xprt_sock()?
My bad, yes, I think you're right.
> > return 0;
> > out:
> > #ifdef CONFIG_PROC_FS
> > @@ -1612,6 +1615,7 @@ static void __exit exit_nfs_fs(void)
> > #ifdef CONFIG_PROC_FS
> > rpc_proc_unregister("nfs");
> > #endif
> > + nfs_cleanup_bc_xprt();
>
> Ditto.
Right, so svc_cleanup_xprt_sock for that one.
--b.
next prev parent reply other threads:[~2011-01-04 21:05 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 ` [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 [this message]
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=20110104210549.GC7908@fieldses.org \
--to=bfields@fieldses.org \
--cc=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).