diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-20 20:52:10 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-20 20:52:10 +0300 |
| commit | 3d3699bde4b043eea17993e4e76804a8128f0fdb (patch) | |
| tree | 95f38fa2768a4be8a59202c629c210e633b5514a /include | |
| parent | e8d018dd0257f744ca50a729e3d042cf2ec9da65 (diff) | |
| parent | 21fd9e8700de86d1169f6336e97d7a74916ed04a (diff) | |
| download | linux-3d3699bde4b043eea17993e4e76804a8128f0fdb.tar.xz | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/lockd/xdr4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/lockd/xdr4.h b/include/linux/lockd/xdr4.h index 9a6b55da8fd6..72831e35dca3 100644 --- a/include/linux/lockd/xdr4.h +++ b/include/linux/lockd/xdr4.h @@ -22,6 +22,7 @@ #define nlm4_fbig cpu_to_be32(NLM_FBIG) #define nlm4_failed cpu_to_be32(NLM_FAILED) +void nlm4svc_set_file_lock_range(struct file_lock *fl, u64 off, u64 len); bool nlm4svc_decode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr); bool nlm4svc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr); bool nlm4svc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr); |