History

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

Pull nfsd updates from Chuck Lever: "This is a light release containing mostly optimizations, code clean- ups, and minor bug fixes. This development cycle has focused on non- upstream kernel work: 1. Continuing to build upstream CI for NFSD, based on kdevops 2. Backporting NFSD filecache-related fixes to selected LTS kernels One notable new feature in v6.10 NFSD is the addition of a new netlink protocol dedicated to configuring NFSD. A new user space tool, nfsdctl, is to be added to nfs-utils. Lots more to come here. As always I am very grateful to NFSD contributors, reviewers, testers, and bug reporters who participated during this cycle" * tag 'nfsd-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (29 commits) NFSD: Force all NFSv4.2 COPY requests to be synchronous SUNRPC: Fix gss_free_in_token_pages() NFS/knfsd: Remove the invalid NFS error 'NFSERR_OPNOTSUPP' knfsd: LOOKUP can return an illegal error value nfsd: set security label during create operations NFSD: Add COPY status code to OFFLOAD_STATUS response NFSD: Record status of async copy operation in struct nfsd4_copy SUNRPC: Remove comment for sp_lock NFSD: add listener-{set,get} netlink command SUNRPC: add a new svc_find_listener helper SUNRPC: introduce svc_xprt_create_from_sa utility routine NFSD: add write_version to netlink command NFSD: convert write_threads to netlink command NFSD: allow callers to pass in scope string to nfsd_svc NFSD: move nfsd_mutex handling into nfsd_svc callers lockd: host: Remove unnecessary statements'host = NULL;' nfsd: don't create nfsv4recoverydir in nfsdfs when not used. nfsd: optimise recalculate_deny_mode() for a common case nfsd: add tracepoint in mark_client_expired_locked nfsd: new tracepoint for check_slot_seqid ...

Linus Torvalds committed 2 years ago

Commit 61ea6472 parents 25f4874 8d915bb29 files · +1286 −271Browse files

Showing the changes to include/uapi/linux (2 of 29 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/nfs.h +0 −1
  2. include/uapi/linux/nfsd_netlink.h +47 −0
include/uapi/linux/nfs.h+0−1
@@ -61,7 +61,6 @@ · 60 unmodified lines
61 NFSERR_NOSPC = 28, /* v2 v3 v4 */61 NFSERR_NOSPC = 28, /* v2 v3 v4 */
62 NFSERR_ROFS = 30, /* v2 v3 v4 */62 NFSERR_ROFS = 30, /* v2 v3 v4 */
63 NFSERR_MLINK = 31, /* v3 v4 */63 NFSERR_MLINK = 31, /* v3 v4 */
64 NFSERR_OPNOTSUPP = 45, /* v2 v3 */
65 NFSERR_NAMETOOLONG = 63, /* v2 v3 v4 */64 NFSERR_NAMETOOLONG = 63, /* v2 v3 v4 */
66 NFSERR_NOTEMPTY = 66, /* v2 v3 v4 */65 NFSERR_NOTEMPTY = 66, /* v2 v3 v4 */
67 NFSERR_DQUOT = 69, /* v2 v3 v4 */66 NFSERR_DQUOT = 69, /* v2 v3 v4 */
include/uapi/linux/nfsd_netlink.h+47−0
@@ -29,8 +29,55 @@ enum { · 28 unmodified lines
29 NFSD_A_RPC_STATUS_MAX = (__NFSD_A_RPC_STATUS_MAX - 1)29 NFSD_A_RPC_STATUS_MAX = (__NFSD_A_RPC_STATUS_MAX - 1)
30};30};
31 31
32enum {
33 NFSD_A_SERVER_THREADS = 1,
34 NFSD_A_SERVER_GRACETIME,
35 NFSD_A_SERVER_LEASETIME,
36 NFSD_A_SERVER_SCOPE,
37
38 __NFSD_A_SERVER_MAX,
39 NFSD_A_SERVER_MAX = (__NFSD_A_SERVER_MAX - 1)
40};
41
42enum {
43 NFSD_A_VERSION_MAJOR = 1,
44 NFSD_A_VERSION_MINOR,
45 NFSD_A_VERSION_ENABLED,
46
47 __NFSD_A_VERSION_MAX,
48 NFSD_A_VERSION_MAX = (__NFSD_A_VERSION_MAX - 1)
49};
50
51enum {
52 NFSD_A_SERVER_PROTO_VERSION = 1,
53
54 __NFSD_A_SERVER_PROTO_MAX,
55 NFSD_A_SERVER_PROTO_MAX = (__NFSD_A_SERVER_PROTO_MAX - 1)
56};
57
58enum {
59 NFSD_A_SOCK_ADDR = 1,
60 NFSD_A_SOCK_TRANSPORT_NAME,
61
62 __NFSD_A_SOCK_MAX,
63 NFSD_A_SOCK_MAX = (__NFSD_A_SOCK_MAX - 1)
64};
65
66enum {
67 NFSD_A_SERVER_SOCK_ADDR = 1,
68
69 __NFSD_A_SERVER_SOCK_MAX,
70 NFSD_A_SERVER_SOCK_MAX = (__NFSD_A_SERVER_SOCK_MAX - 1)
71};
72
32enum {73enum {
33 NFSD_CMD_RPC_STATUS_GET = 1,74 NFSD_CMD_RPC_STATUS_GET = 1,
75 NFSD_CMD_THREADS_SET,
76 NFSD_CMD_THREADS_GET,
77 NFSD_CMD_VERSION_SET,
78 NFSD_CMD_VERSION_GET,
79 NFSD_CMD_LISTENER_SET,
80 NFSD_CMD_LISTENER_GET,
34 81
35 __NFSD_CMD_MAX,82 __NFSD_CMD_MAX,
36 NFSD_CMD_MAX = (__NFSD_CMD_MAX - 1)83 NFSD_CMD_MAX = (__NFSD_CMD_MAX - 1)