Merge tag 'nfsd-6.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

Pull nfsd fix from Chuck Lever:

 - Fix another regression in the NFSD administrative API

* tag 'nfsd-6.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: drop the nfsd_put helper

diff --combined fs/nfsd/nfsctl.c
index 7cd513e59305efe3e723b68d41e9af409aa13801,25b5863bf3c852d23b675a5ed6ca3e01259bbedf..87fed75808ff677c01827df02b9cddbd436145f4
--- 1/fs/nfsd/nfsctl.c
--- 2/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@@ -693,6 -693,7 +693,7 @@@ static ssize_t __write_ports_addfd(cha
        char *mesg = buf;
        int fd, err;
        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+       struct svc_serv *serv;
  
        err = get_int(&mesg, &fd);
        if (err != 0 || fd < 0)
@@@ -703,15 -704,15 +704,15 @@@
        if (err != 0)
                return err;
  
-       err = svc_addsock(nn->nfsd_serv, net, fd, buf, SIMPLE_TRANSACTION_LIMIT, cred);
+       serv = nn->nfsd_serv;
+       err = svc_addsock(serv, net, fd, buf, SIMPLE_TRANSACTION_LIMIT, cred);
  
-       if (err < 0 && !nn->nfsd_serv->sv_nrthreads && !nn->keep_active)
+       if (err < 0 && !serv->sv_nrthreads && !nn->keep_active)
                nfsd_last_thread(net);
-       else if (err >= 0 &&
-                !nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
-               svc_get(nn->nfsd_serv);
+       else if (err >= 0 && !serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
+               svc_get(serv);
  
-       nfsd_put(net);
+       svc_put(serv);
        return err;
  }
  
@@@ -725,6 -726,7 +726,7 @@@ static ssize_t __write_ports_addxprt(ch
        struct svc_xprt *xprt;
        int port, err;
        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+       struct svc_serv *serv;
  
        if (sscanf(buf, "%15s %5u", transport, &port) != 2)
                return -EINVAL;
@@@ -737,32 -739,33 +739,33 @@@
        if (err != 0)
                return err;
  
-       err = svc_xprt_create(nn->nfsd_serv, transport, net,
+       serv = nn->nfsd_serv;
+       err = svc_xprt_create(serv, transport, net,
                              PF_INET, port, SVC_SOCK_ANONYMOUS, cred);
        if (err < 0)
                goto out_err;
  
-       err = svc_xprt_create(nn->nfsd_serv, transport, net,
+       err = svc_xprt_create(serv, transport, net,
                              PF_INET6, port, SVC_SOCK_ANONYMOUS, cred);
        if (err < 0 && err != -EAFNOSUPPORT)
                goto out_close;
  
-       if (!nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
-               svc_get(nn->nfsd_serv);
+       if (!serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
+               svc_get(serv);
  
-       nfsd_put(net);
+       svc_put(serv);
        return 0;
  out_close:
-       xprt = svc_find_xprt(nn->nfsd_serv, transport, net, PF_INET, port);
+       xprt = svc_find_xprt(serv, transport, net, PF_INET, port);
        if (xprt != NULL) {
                svc_xprt_close(xprt);
                svc_xprt_put(xprt);
        }
  out_err:
-       if (!nn->nfsd_serv->sv_nrthreads && !nn->keep_active)
+       if (!serv->sv_nrthreads && !nn->keep_active)
                nfsd_last_thread(net);
  
-       nfsd_put(net);
+       svc_put(serv);
        return err;
  }
  
@@@ -1138,7 -1141,7 +1141,7 @@@ static struct inode *nfsd_get_inode(str
        /* Following advice from simple_fill_super documentation: */
        inode->i_ino = iunique(sb, NFSD_MaxReserved);
        inode->i_mode = mode;
 -      inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
 +      simple_inode_init_ts(inode);
        switch (mode & S_IFMT) {
        case S_IFDIR:
                inode->i_fop = &simple_dir_operations;