History

Merge tag 'nfs-for-6.3-2' of git://git.linux-nfs.org/projects/anna/linux-nfs

Pull NFS client fixes from Anna Schumaker: - Fix /proc/PID/io read_bytes accounting - Fix setting NLM file_lock start and end during decoding testargs - Fix timing for setting access cache timestamps * tag 'nfs-for-6.3-2' of git://git.linux-nfs.org/projects/anna/linux-nfs: NFS: Correct timing for assigning access cache timestamp lockd: set file_lock start and end when decoding nlm4 testargs NFS: Fix /proc/PID/io read_bytes for buffered reads

Linus Torvalds committed 3 years ago

Commit 3d3699b2 parents e8d018d 21fd9e85 files · +18 −10Browse files

Showing the changes to include/linux (1 of 5 files). Show all

Unified · Split

include/linux/lockd/xdr4.h+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
22#define nlm4_fbig cpu_to_be32(NLM_FBIG)22#define nlm4_fbig cpu_to_be32(NLM_FBIG)
23#define nlm4_failed cpu_to_be32(NLM_FAILED)23#define nlm4_failed cpu_to_be32(NLM_FAILED)
24 24
25void nlm4svc_set_file_lock_range(struct file_lock *fl, u64 off, u64 len);
25bool nlm4svc_decode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr);26bool nlm4svc_decode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr);
26bool nlm4svc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);27bool nlm4svc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
27bool nlm4svc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);28bool nlm4svc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);