Commit 445d9f05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull nfsd updates from Chuck Lever:
 "Jeff Layton contributed a scalability improvement to NFSD's NFSv4
  backchannel session implementation. This improvement is intended to
  increase the rate at which NFSD can safely recall NFSv4 delegations
  from clients, to avoid the need to revoke them. Revoking requires a
  slow state recovery process.

  A wide variety of bug fixes and other incremental improvements make up
  the bulk of commits in this series. As always I am grateful to the
  NFSD contributors, reviewers, testers, and bug reporters who
  participated during this cycle"

* tag 'nfsd-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (72 commits)
  nfsd: allow for up to 32 callback session slots
  nfs_common: must not hold RCU while calling nfsd_file_put_local
  nfsd: get rid of include ../internal.h
  nfsd: fix nfs4_openowner leak when concurrent nfsd4_open occur
  NFSD: Add nfsd4_copy time-to-live
  NFSD: Add a laundromat reaper for async copy state
  NFSD: Block DESTROY_CLIENTID only when there are ongoing async COPY operations
  NFSD: Handle an NFS4ERR_DELAY response to CB_OFFLOAD
  NFSD: Free async copy information in nfsd4_cb_offload_release()
  NFSD: Fix nfsd4_shutdown_copy()
  NFSD: Add a tracepoint to record canceled async COPY operations
  nfsd: make nfsd4_session->se_flags a bool
  nfsd: remove nfsd4_session->se_bchannel
  nfsd: make use of warning provided by refcount_t
  nfsd: Don't fail OP_SETCLIENTID when there are too many clients.
  svcrdma: fix miss destroy percpu_counter in svc_rdma_proc_init()
  xdrgen: Remove program_stat_to_errno() call sites
  xdrgen: Update the files included in client-side source code
  xdrgen: Remove check for "nfs_ok" in C templates
  xdrgen: Remove tracepoint call site
  ...
parents 44b4d13b 583772ee

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12436,6 +12436,7 @@ F: include/trace/misc/sunrpc.h 
F:	include/uapi/linux/nfsd/

F:	include/uapi/linux/sunrpc/

F:	net/sunrpc/

F:	tools/net/sunrpc/









KERNEL PACMAN PACKAGING (in addition to generic KERNEL BUILD)









M:	Thomas Weißschuh <linux@weissschuh.net>
































fs/lockd/clntxdr.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -2,8 +2,9 @@







/*









 * linux/fs/lockd/clntxdr.c









 *









 * XDR functions to encode/decode NLM version 3 RPC arguments and results.









 * NLM version 3 is backwards compatible with NLM versions 1 and 2.









 * XDR functions to encode/decode NLM version 1 and 3 RPC









 * arguments and results. NLM version 2 is not specified









 * by a standard, thus it is not implemented.









 *









 * NLM client-side only.









 *
































fs/lockd/svc4proc.c



+5
−15






























Original line number
Diff line number
Diff line







@@ -46,13 +46,14 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,







	if (filp != NULL) {









		int mode = lock_to_openmode(&lock->fl);



















		lock->fl.c.flc_flags = FL_POSIX;



















		error = nlm_lookup_file(rqstp, &file, lock);









		if (error)









			goto no_locks;









		*filp = file;



















		/* Set up the missing parts of the file_lock structure */









		lock->fl.c.flc_flags = FL_POSIX;









		lock->fl.c.flc_file = file->f_file[mode];









		lock->fl.c.flc_pid = current->tgid;









		lock->fl.fl_start = (loff_t)lock->lock_start;








@@ -108,7 +109,8 @@ __nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp)

















	test_owner = argp->lock.fl.c.flc_owner;









	/* Now check for conflicting locks */









	resp->status = nlmsvc_testlock(rqstp, file, host, &argp->lock, &resp->lock, &resp->cookie);









	resp->status = nlmsvc_testlock(rqstp, file, host, &argp->lock,









				       &resp->lock);









	if (resp->status == nlm_drop_reply)









		rc = rpc_drop_reply;









	else








@@ -142,18 +144,6 @@ __nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_res *resp)







	if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))









		return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;



















#if 0









	/* If supplied state doesn't match current state, we assume it's









	 * an old request that time-warped somehow. Any error return would









	 * do in this case because it's irrelevant anyway.









	 *









	 * NB: We don't retrieve the remote host's state yet.









	 */









	if (host->h_nsmstate && host->h_nsmstate != argp->state) {









		resp->status = nlm_lck_denied_nolocks;









	} else









#endif



















	/* Now try to lock the file */









	resp->status = nlmsvc_lock(rqstp, file, host, &argp->lock,









					argp->block, &argp->cookie,
































fs/lockd/svclock.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -608,7 +608,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,







__be32









nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,









		struct nlm_host *host, struct nlm_lock *lock,









		struct nlm_lock *conflock, struct nlm_cookie *cookie)









		struct nlm_lock *conflock)









{









	int			error;









	int			mode;
































fs/lockd/svcproc.c



+2
−13






























Original line number
Diff line number
Diff line







@@ -130,7 +130,8 @@ __nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp)







	test_owner = argp->lock.fl.c.flc_owner;



















	/* Now check for conflicting locks */









	resp->status = cast_status(nlmsvc_testlock(rqstp, file, host, &argp->lock, &resp->lock, &resp->cookie));









	resp->status = cast_status(nlmsvc_testlock(rqstp, file, host,









						   &argp->lock, &resp->lock));









	if (resp->status == nlm_drop_reply)









		rc = rpc_drop_reply;









	else








@@ -165,18 +166,6 @@ __nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_res *resp)







	if ((resp->status = nlmsvc_retrieve_args(rqstp, argp, &host, &file)))









		return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;



















#if 0









	/* If supplied state doesn't match current state, we assume it's









	 * an old request that time-warped somehow. Any error return would









	 * do in this case because it's irrelevant anyway.









	 *









	 * NB: We don't retrieve the remote host's state yet.









	 */









	if (host->h_nsmstate && host->h_nsmstate != argp->state) {









		resp->status = nlm_lck_denied_nolocks;









	} else









#endif



















	/* Now try to lock the file */









	resp->status = cast_status(nlmsvc_lock(rqstp, file, host, &argp->lock,









					       argp->block, &argp->cookie,