Pull nfsd updates from Bruce Fields: "The one new feature this time, from Anna Schumaker, is READ_PLUS, which has the same arguments as READ but allows the server to return an array of data and hole extents. Otherwise it's a lot of cleanup and bugfixes" * tag 'nfsd-5.10' of git://linux-nfs.org/~bfields/linux: (43 commits) NFSv4.2: Fix NFS4ERR_STALE error when doing inter server copy SUNRPC: fix copying of multiple pages in gss_read_proxy_verf() sunrpc: raise kernel RPC channel buffer size svcrdma: fix bounce buffers for unaligned offsets and multiple pages nfsd: remove unneeded break net/sunrpc: Fix return value for sysctl sunrpc.transports NFSD: Encode a full READ_PLUS reply NFSD: Return both a hole and a data segment NFSD: Add READ_PLUS hole segment encoding NFSD: Add READ_PLUS data support NFSD: Hoist status code encoding into XDR encoder functions NFSD: Map nfserr_wrongsec outside of nfsd_dispatch NFSD: Remove the RETURN_STATUS() macro NFSD: Call NFSv2 encoders on error returns NFSD: Fix .pc_release method for NFSv2 NFSD: Remove vestigial typedefs NFSD: Refactor nfsd_dispatch() error paths NFSD: Clean up nfsd_dispatch() variables NFSD: Clean up stale comments in nfsd_dispatch() NFSD: Clean up switch statement in nfsd_dispatch() ...
Showing the changes to include/uapi/linux (1 of 44 files). Show all
Unified · Split
| @@ -9,11 +9,13 @@ · 8 unmodified lines | ||
| 9 | 9 | |
| 10 | 10 | #define NFS_ACL_PROGRAM 100227 |
| 11 | 11 | |
| 12 | +#define ACLPROC2_NULL 0 | |
| 12 | 13 | #define ACLPROC2_GETACL 1 |
| 13 | 14 | #define ACLPROC2_SETACL 2 |
| 14 | 15 | #define ACLPROC2_GETATTR 3 |
| 15 | 16 | #define ACLPROC2_ACCESS 4 |
| 16 | 17 | |
| 18 | +#define ACLPROC3_NULL 0 | |
| 17 | 19 | #define ACLPROC3_GETACL 1 |
| 18 | 20 | #define ACLPROC3_SETACL 2 |
| 19 | 21 | |