[Devel] [PATCH 3/6] nfsd: pass net to nfsd_create_serv()

J. Bruce Fields bfields at fieldses.org
Fri Dec 7 08:52:11 PST 2012


On Tue, Dec 04, 2012 at 04:50:16PM +0300, Stanislav Kinsbursky wrote:
> diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
> index 21cba3d..6448391 100644
> --- a/fs/nfsd/nfssvc.c
> +++ b/fs/nfsd/nfssvc.c
> @@ -334,10 +334,9 @@ static int nfsd_get_default_max_blksize(void)
>  	return ret;
>  }
>  
> -int nfsd_create_serv(void)
> +int nfsd_create_serv(struct net *net)
>  {
>  	int error;
> -	struct net *net = &init_net;

What does this apply to?  Since 3.6-rc1 we have 
57c8b13e3cd0f94944c9691ce7f58e5fcef8a12d "NFSd: set nfsd_serv to NULL
after service destruction" which includes:

@@ -332,6 +330,7 @@ static int nfsd_get_default_max_blksize(void)
 int nfsd_create_serv(void)
 {
        int error;
+       struct net *net = current->nsproxy->net_ns;
 
        WARN_ON(!mutex_is_locked(&nfsd_mutex));
        if (nfsd_serv) {

Am I missing some later patch?

--b.



More information about the Devel mailing list