Pull nfsd updates from Bruce Fields: "Another RDMA update from Chuck Lever, and a bunch of miscellaneous bugfixes" * tag 'nfsd-4.12' of git://linux-nfs.org/~bfields/linux: (26 commits) nfsd: Fix up the "supattr_exclcreat" attributes nfsd: encoders mustn't use unitialized values in error cases nfsd: fix undefined behavior in nfsd4_layout_verify lockd: fix lockd shutdown race NFSv4: Fix callback server shutdown SUNRPC: Refactor svc_set_num_threads() NFSv4.x/callback: Create the callback service through svc_create_pooled lockd: remove redundant check on block svcrdma: Clean out old XDR encoders svcrdma: Remove the req_map cache svcrdma: Remove unused RDMA Write completion handler svcrdma: Reduce size of sge array in struct svc_rdma_op_ctxt svcrdma: Clean up RPC-over-RDMA backchannel reply processing svcrdma: Report Write/Reply chunk overruns svcrdma: Clean up RDMA_ERROR path svcrdma: Use rdma_rw API in RPC reply path svcrdma: Introduce local rdma_rw API helpers svcrdma: Clean up svc_rdma_get_inv_rkey() svcrdma: Add helper to save pages under I/O svcrdma: Eliminate RPCRDMA_SQ_DEPTH_MULT ...
Showing the changes to include/uapi/linux (1 of 23 files). Show all
Unified · Split
| @@ -22,6 +22,8 @@ · 21 unmodified lines | ||
| 22 | 22 | #ifndef _NFSD_CLD_H |
| 23 | 23 | #define _NFSD_CLD_H |
| 24 | 24 | |
| 25 | +#include <linux/types.h> | |
| 26 | + | |
| 25 | 27 | /* latest upcall version available */ |
| 26 | 28 | #define CLD_UPCALL_VERSION 1 |
| 27 | 29 | |
| @@ -37,18 +39,18 @@ enum cld_command { · 9 unmodified lines | ||
| 37 | 39 | |
| 38 | 40 | /* representation of long-form NFSv4 client ID */ |
| 39 | 41 | struct cld_name { |
| 40 | − uint16_t cn_len; /* length of cm_id */ | |
| 42 | + __u16 cn_len; /* length of cm_id */ | |
| 41 | 43 | unsigned char cn_id[NFS4_OPAQUE_LIMIT]; /* client-provided */ |
| 42 | 44 | } __attribute__((packed)); |
| 43 | 45 | |
| 44 | 46 | /* message struct for communication with userspace */ |
| 45 | 47 | struct cld_msg { |
| 46 | − uint8_t cm_vers; /* upcall version */ | |
| 47 | − uint8_t cm_cmd; /* upcall command */ | |
| 48 | − int16_t cm_status; /* return code */ | |
| 49 | − uint32_t cm_xid; /* transaction id */ | |
| 48 | + __u8 cm_vers; /* upcall version */ | |
| 49 | + __u8 cm_cmd; /* upcall command */ | |
| 50 | + __s16 cm_status; /* return code */ | |
| 51 | + __u32 cm_xid; /* transaction id */ | |
| 50 | 52 | union { |
| 51 | − int64_t cm_gracetime; /* grace period start time */ | |
| 53 | + __s64 cm_gracetime; /* grace period start time */ | |
| 52 | 54 | struct cld_name cm_name; |
| 53 | 55 | } __attribute__((packed)) cm_u; |
| 54 | 56 | } __attribute__((packed)); |