NFSD: move nfsd_mutex handling into nfsd_svc callers

Currently nfsd_svc holds the nfsd_mutex over the whole function. For
some of the later netlink patches though, we want to do some other
things to the server before starting it. Move the mutex handling into
the callers.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 340c5d61f199d8542651c41b2be89bed31856b76..2fe78b802f98467b7046b5b4cc27878715606270 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -404,7 +404,9 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size)
                if (newthreads < 0)
                        return -EINVAL;
                trace_nfsd_ctl_threads(net, newthreads);
+               mutex_lock(&nfsd_mutex);
                rv = nfsd_svc(newthreads, net, file->f_cred);
+               mutex_unlock(&nfsd_mutex);
                if (rv < 0)
                        return rv;
        } else

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index c0d17b92b249f7db6f084ad005d7eefd4a595fc7..ca193f7ff0e1573523bffbe616a03c57c7931e42 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -775,7 +775,8 @@ nfsd_svc(int nrservs, struct net *net, const struct cred *cred)
        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
        struct svc_serv *serv;
 
-       mutex_lock(&nfsd_mutex);
+       lockdep_assert_held(&nfsd_mutex);
+
        dprintk("nfsd: creating service\n");
 
        nrservs = max(nrservs, 0);
@@ -804,7 +805,6 @@ out_put:
        if (serv->sv_nrthreads == 0)
                nfsd_destroy_serv(net);
 out:
-       mutex_unlock(&nfsd_mutex);
        return error;
 }