Commit f7976a64 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull nfsd updates from Chuck Lever:

 - Clean-ups in the READ path in anticipation of MSG_SPLICE_PAGES

 - Better NUMA awareness when allocating pages and other objects

 - A number of minor clean-ups to XDR encoding

 - Elimination of a race when accepting a TCP socket

 - Numerous observability enhancements

* tag 'nfsd-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (46 commits)
  nfsd: remove redundant assignments to variable len
  svcrdma: Fix stale comment
  NFSD: Distinguish per-net namespace initialization
  nfsd: move init of percpu reply_cache_stats counters back to nfsd_init_net
  SUNRPC: Address RCU warning in net/sunrpc/svc.c
  SUNRPC: Use sysfs_emit in place of strlcpy/sprintf
  SUNRPC: Remove transport class dprintk call sites
  SUNRPC: Fix comments for transport class registration
  svcrdma: Remove an unused argument from __svc_rdma_put_rw_ctxt()
  svcrdma: trace cc_release calls
  svcrdma: Convert "might sleep" comment into a code annotation
  NFSD: Add an nfsd4_encode_nfstime4() helper
  SUNRPC: Move initialization of rq_stime
  SUNRPC: Optimize page release in svc_rdma_sendto()
  svcrdma: Prevent page release when nothing was received
  svcrdma: Revert 2a1e4f21 ("svcrdma: Normalize Send page handling")
  SUNRPC: Revert 57990067 ("svcrdma: Remove unused sc_pages field")
  SUNRPC: Revert cc93ce95 ("svcrdma: Retain the page backing rq_res.head[0].iov_base")
  NFSD: add encoding of op_recall flag for write delegation
  NFSD: Add "official" reviewers for this subsystem
  ...
parents c0a572d9 75bfb704

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ Henrik Rydberg <rydberg@bitmath.org> 
Herbert Xu <herbert@gondor.apana.org.au>

Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>

Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>

J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>

J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>

Jacob Shin <Jacob.Shin@amd.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -11275,6 +11275,10 @@ W: http://kernelnewbies.org/KernelJanitors 
KERNEL NFSD, SUNRPC, AND LOCKD SERVERS

M:	Chuck Lever <chuck.lever@oracle.com>

M:	Jeff Layton <jlayton@kernel.org>

R:	Neil Brown <neilb@suse.de>

R:	Olga Kornievskaia <kolga@netapp.com>

R:	Dai Ngo <Dai.Ngo@oracle.com>

R:	Tom Talpey <tom@talpey.com>

L:	linux-nfs@vger.kernel.org

S:	Supported

W:	http://nfs.sourceforge.net/

fs/lockd/svc.c

+0 −1
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ static int lockd_get(void) 
	int error;



	if (nlmsvc_serv) {

		svc_get(nlmsvc_serv);

		nlmsvc_users++;

		return 0;

	}

fs/nfsd/cache.h

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ enum { 


int	nfsd_drc_slab_create(void);

void	nfsd_drc_slab_free(void);

int	nfsd_net_reply_cache_init(struct nfsd_net *nn);

void	nfsd_net_reply_cache_destroy(struct nfsd_net *nn);

int	nfsd_reply_cache_init(struct nfsd_net *);

void	nfsd_reply_cache_shutdown(struct nfsd_net *);

int	nfsd_cache_lookup(struct svc_rqst *);

fs/nfsd/export.c

+5 −7
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) 
		goto out;



	err = -EINVAL;

	if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0)

	if (qword_get(&mesg, buf, PAGE_SIZE) <= 0)

		goto out;



	err = -ENOENT;
@@ -107,7 +107,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) 
	dprintk("found domain %s\n", buf);



	err = -EINVAL;

	if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0)

	if (qword_get(&mesg, buf, PAGE_SIZE) <= 0)

		goto out;

	fsidtype = simple_strtoul(buf, &ep, 10);

	if (*ep)
@@ -593,7 +593,6 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen) 
{

	/* client path expiry [flags anonuid anongid fsid] */

	char *buf;

	int len;

	int err;

	struct auth_domain *dom = NULL;

	struct svc_export exp = {}, *expp;
@@ -609,8 +608,7 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen) 


	/* client */

	err = -EINVAL;

	len = qword_get(&mesg, buf, PAGE_SIZE);

	if (len <= 0)

	if (qword_get(&mesg, buf, PAGE_SIZE) <= 0)

		goto out;



	err = -ENOENT;
@@ -620,7 +618,7 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen) 


	/* path */

	err = -EINVAL;

	if ((len = qword_get(&mesg, buf, PAGE_SIZE)) <= 0)

	if (qword_get(&mesg, buf, PAGE_SIZE) <= 0)

		goto out1;



	err = kern_path(buf, 0, &exp.ex_path);
@@ -665,7 +663,7 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen) 
			goto out3;

		exp.ex_fsid = an_int;



		while ((len = qword_get(&mesg, buf, PAGE_SIZE)) > 0) {

		while (qword_get(&mesg, buf, PAGE_SIZE) > 0) {

			if (strcmp(buf, "fsloc") == 0)

				err = fsloc_parse(&mesg, buf, &exp.ex_fslocs);

			else if (strcmp(buf, "uuid") == 0)