Commit 586a7a85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull nfsd updates from Chuck Lever:
 "This is a light release containing optimizations, code clean-ups, and
  minor bug fixes.

  This development cycle focused on work outside of upstream kernel
  development:

   - Continuing to build upstream CI for NFSD based on kdevops

   - Continuing to focus on the quality of NFSD in LTS kernels

   - Participation in IETF nfsv4 WG discussions about NFSv4 ACLs,
     directory delegation, and NFSv4.2 COPY offload

  Notable features for v6.11 that do not come through the NFSD tree
  include NFS server-side support for the new pNFS NVMe layout type
  [RFC9561]. Functional testing for pNFS block layouts like this one has
  been introduced to our kdevops CI harness. Work on improving the
  resolution of file attribute time stamps in local filesystems is also
  ongoing tree-wide.

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

* tag 'nfsd-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: nfsd_file_lease_notifier_call gets a file_lease as an argument
  gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
  MAINTAINERS: Add a bugzilla link for NFSD
  nfsd: new netlink ops to get/set server pool_mode
  sunrpc: refactor pool_mode setting code
  nfsd: allow passing in array of thread counts via netlink
  nfsd: make nfsd_svc take an array of thread counts
  sunrpc: fix up the special handling of sv_nrpools == 1
  SUNRPC: Add a trace point in svc_xprt_deferred_close
  NFSD: Support write delegations in LAYOUTGET
  lockd: Use *-y instead of *-objs in Makefile
  NFSD: Fix nfsdcld warning
  svcrdma: Handle ADDR_CHANGE CM event properly
  svcrdma: Refactor the creation of listener CMA ID
  NFSD: remove unused structs 'nfsd3_voidargs'
  NFSD: harden svcxdr_dupstr() and svcxdr_tmpalloc() against integer overflows
parents 48f8bfd4 769d2002

Documentation/netlink/specs/nfsd.yaml

+27 −0
Original line number Diff line number Diff line
@@ -115,6 +115,15 @@ attribute-sets: 
        type: nest

        nested-attributes: sock

        multi-attr: true

  -

    name: pool-mode

    attributes:

      -

        name: mode

        type: string

      -

        name: npools

        type: u32



operations:

  list:
@@ -195,3 +204,21 @@ operations: 
        reply:

          attributes:

            - addr

    -

      name: pool-mode-set

      doc: set the current server pool-mode

      attribute-set: pool-mode

      flags: [ admin-perm ]

      do:

        request:

          attributes:

            - mode

    -

      name: pool-mode-get

      doc: get info about server pool-mode

      attribute-set: pool-mode

      do:

        reply:

          attributes:

            - mode

            - npools

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -12065,7 +12065,7 @@ 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/

B:	https://bugzilla.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git

F:	Documentation/filesystems/nfs/

F:	fs/lockd/

fs/lockd/Makefile

+4 −5
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ ccflags-y += -I$(src) # needed for trace events 


obj-$(CONFIG_LOCKD) += lockd.o



lockd-objs-y += clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \

lockd-y := clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \

	   svcshare.o svcproc.o svcsubs.o mon.o trace.o xdr.o

lockd-objs-$(CONFIG_LOCKD_V4) += clnt4xdr.o xdr4.o svc4proc.o

lockd-objs-$(CONFIG_PROC_FS) += procfs.o

lockd-objs		      := $(lockd-objs-y)
 
lockd-$(CONFIG_LOCKD_V4) += clnt4xdr.o xdr4.o svc4proc.o

lockd-$(CONFIG_PROC_FS) += procfs.o

fs/nfsd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ config NFSD_V4_SECURITY_LABEL 
config NFSD_LEGACY_CLIENT_TRACKING

	bool "Support legacy NFSv4 client tracking methods (DEPRECATED)"

	depends on NFSD_V4

	default n

	default y

	help

	  The NFSv4 server needs to store a small amount of information on

	  stable storage in order to handle state recovery after reboot. Most

fs/nfsd/filecache.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static int 
nfsd_file_lease_notifier_call(struct notifier_block *nb, unsigned long arg,

			    void *data)

{

	struct file_lock *fl = data;

	struct file_lease *fl = data;



	/* Only close files for F_SETLEASE leases */

	if (fl->c.flc_flags & FL_LEASE)