Commit 18ba6034 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull nfsd updates from Chuck Lever:
 "Notable features of this release include:

   - Pre-requisites for automatically determining the RPC server thread
     count

   - Clean-up and preparation for supporting LOCALIO, which will be
     merged via the NFS client tree

   - Enhancements and fixes to NFSv4.2 COPY offload

   - A new Python-based tool for generating kernel SunRPC XDR encoding
     and decoding functions, added as an aid for prototyping features in
     protocols based on the Linux kernel's SunRPC implementation

  As always I am grateful to the NFSD contributors, reviewers, testers,
  and bug reporters who participated during this cycle"

* tag 'nfsd-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (57 commits)
  xdrgen: Prevent reordering of encoder and decoder functions
  xdrgen: typedefs should use the built-in string and opaque functions
  xdrgen: Fix return code checking in built-in XDR decoders
  tools: Add xdrgen
  nfsd: fix delegation_blocked() to block correctly for at least 30 seconds
  nfsd: fix initial getattr on write delegation
  nfsd: untangle code in nfsd4_deleg_getattr_conflict()
  nfsd: enforce upper limit for namelen in __cld_pipe_inprogress_downcall()
  nfsd: return -EINVAL when namelen is 0
  NFSD: Wrap async copy operations with trace points
  NFSD: Clean up extra whitespace in trace_nfsd_copy_done
  NFSD: Record the callback stateid in copy tracepoints
  NFSD: Display copy stateids with conventional print formatting
  NFSD: Limit the number of concurrent async COPY operations
  NFSD: Async COPY result needs to return a write verifier
  nfsd: avoid races with wake_up_var()
  nfsd: use clear_and_wake_up_bit()
  sunrpc: xprtrdma: Use ERR_CAST() to return
  NFSD: Annotate struct pnfs_block_deviceaddr with __counted_by()
  nfsd: call cache_put if xdr_reserve_space returns NULL
  ...
parents 721068de 509abfc7

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -154,6 +154,9 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com> 
Christian Marangi <ansuelsmth@gmail.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Chuck Lever <chuck.lever@oracle.com> <cel@kernel.org>

Chuck Lever <chuck.lever@oracle.com> <cel@netapp.com>

Chuck Lever <chuck.lever@oracle.com> <cel@citi.umich.edu>

Claudiu Beznea <claudiu.beznea@tuxon.dev> <claudiu.beznea@microchip.com>

Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>

Corey Minyard <minyard@acm.org>

fs/lockd/host.c

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ nlm_bind_host(struct nlm_host *host) 
	if ((clnt = host->h_rpcclnt) != NULL) {

		nlm_rebind_host(host);

	} else {

		unsigned long increment = nlmsvc_timeout;

		unsigned long increment = nlm_timeout * HZ;

		struct rpc_timeout timeparms = {

			.to_initval	= increment,

			.to_increment	= increment,

fs/lockd/svc.c

+3 −6
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ EXPORT_SYMBOL_GPL(nlmsvc_ops); 
static DEFINE_MUTEX(nlmsvc_mutex);

static unsigned int		nlmsvc_users;

static struct svc_serv		*nlmsvc_serv;

unsigned long			nlmsvc_timeout;



static void nlmsvc_request_retry(struct timer_list *tl)

{
@@ -68,7 +67,7 @@ unsigned int lockd_net_id; 
 * and also changed through the sysctl interface.  -- Jamie Lokier, Aug 2003

 */

static unsigned long		nlm_grace_period;

static unsigned long		nlm_timeout = LOCKD_DFLT_TIMEO;

unsigned long			nlm_timeout = LOCKD_DFLT_TIMEO;

static int			nlm_udpport, nlm_tcpport;



/* RLIM_NOFILE defaults to 1024. That seems like a reasonable default here. */
@@ -125,6 +124,8 @@ lockd(void *vrqstp) 
	struct net *net = &init_net;

	struct lockd_net *ln = net_generic(net, lockd_net_id);



	svc_thread_init_status(rqstp, 0);



	/* try_to_freeze() is called from svc_recv() */

	set_freezable();
@@ -333,10 +334,6 @@ static int lockd_get(void) 
		printk(KERN_WARNING

			"lockd_up: no pid, %d users??\n", nlmsvc_users);



	if (!nlm_timeout)

		nlm_timeout = LOCKD_DFLT_TIMEO;

	nlmsvc_timeout = nlm_timeout * HZ;



	serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, lockd);

	if (!serv) {

		printk(KERN_WARNING "lockd_up: create service failed\n");

fs/nfs/callback.c

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ nfs4_callback_svc(void *vrqstp) 
{

	struct svc_rqst *rqstp = vrqstp;



	svc_thread_init_status(rqstp, 0);



	set_freezable();



	while (!svc_thread_should_stop(rqstp))

fs/nfsd/auth.c

+7 −7
Original line number Diff line number Diff line
@@ -5,26 +5,26 @@ 
#include "nfsd.h"

#include "auth.h"



int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)

int nfsexp_flags(struct svc_cred *cred, struct svc_export *exp)

{

	struct exp_flavor_info *f;

	struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors;



	for (f = exp->ex_flavors; f < end; f++) {

		if (f->pseudoflavor == rqstp->rq_cred.cr_flavor)

		if (f->pseudoflavor == cred->cr_flavor)

			return f->flags;

	}

	return exp->ex_flags;



}



int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)

int nfsd_setuser(struct svc_cred *cred, struct svc_export *exp)

{

	struct group_info *rqgi;

	struct group_info *gi;

	struct cred *new;

	int i;

	int flags = nfsexp_flags(rqstp, exp);

	int flags = nfsexp_flags(cred, exp);



	/* discard any old override before preparing the new set */

	revert_creds(get_cred(current_real_cred()));
@@ -32,10 +32,10 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp) 
	if (!new)

		return -ENOMEM;



	new->fsuid = rqstp->rq_cred.cr_uid;

	new->fsgid = rqstp->rq_cred.cr_gid;

	new->fsuid = cred->cr_uid;

	new->fsgid = cred->cr_gid;



	rqgi = rqstp->rq_cred.cr_group_info;

	rqgi = cred->cr_group_info;



	if (flags & NFSEXP_ALLSQUASH) {

		new->fsuid = exp->ex_anon_uid;