filelock: split file leases out of struct file_lock
Status from this message: Applied to the vfs.file branch of the vfs/vfs.git tree.
Get series with b4
b4 am [email protected] change-id 20240116-flsplit-bdb46824db68Versions newest first
- v3 Latest47 patches 9 repliesApplied
- v241 patches 4 repliesSuperseded
- v120 patches 19 repliesSuperseded
Changes in v3 from the cover letter
- Rename "flc_core" fields in file_lock and file_lease to "c"
- new helpers: locks_wake_up, for_each_file_lock, and lock_is_{unlock,read,write}
- Link to v2: https://lore.kernel.org/r/[email protected]
Patches in v3 Applied
Reviews trailers per patch
1 of 47 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | NeilBrown | Jeff Layton |
|---|---|---|
| Series | R-b | |
| 1/47 | ||
| 2/47 | ||
| 3/47 | ||
| 4/47 | R-b | |
| 5/47 | ||
| 6/47 | ||
| 7/47 | ||
| 8/47 | ||
| 9/47 | ||
| 10/47 | ||
| 11/47 | ||
| 12/47 | ||
| 13/47 | ||
| 14/47 | ||
| 15/47 | ||
| 16/47 | ||
| 17/47 | ||
| 18/47 | ||
| 19/47 | ||
| 20/47 | ||
| 21/47 | ||
| 22/47 | ||
| 23/47 | ||
| 24/47 | ||
| 25/47 | ||
| 26/47 | ||
| 27/47 | ||
| 28/47 | ||
| 29/47 | ||
| 30/47 | ||
| 31/47 | ||
| 32/47 | ||
| 33/47 | ||
| 34/47 | ||
| 35/47 | ||
| 36/47 | ||
| 37/47 | ||
| 38/47 | ||
| 39/47 | ||
| 40/47 | ||
| 41/47 | ||
| 42/47 | ||
| 43/47 | ||
| 44/47 | ||
| 45/47 | ||
| 46/47 | ||
| 47/47 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v3 00/47] filelock: split file leases out of struct file_lock
I'm not sure this is much prettier than the last, but contracting "fl_core" to "c", as Neil suggested is a bit easier on the eyes.
I also added a few small helpers and converted several users over to them. That reduces the size of the per-fs conversion patches later in the series. I played with some others too, but they were too awkward or not frequently used enough to make it worthwhile.
Many thanks to Chuck and Neil for the earlier R-b's and comments. I've dropped those for now since this set is a bit different from the last.
I'd like to get this into linux-next soon and we can see about merging it for v6.9, unless anyone has major objections.
Thanks!
---
Changes in v3:
- Rename "flc_core" fields in file_lock and file_lease to "c"
- new helpers: locks_wake_up, for_each_file_lock, and lock_is_{unlock,read,write}
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- renamed file_lock_core fields to have "flc_" prefix
- used macros to more easily do the change piecemeal
- broke up patches into per-subsystem ones
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Jeff Layton (47):
filelock: fl_pid field should be signed int
filelock: rename some fields in tracepoints
filelock: rename fl_pid variable in lock_get_status
filelock: add some new helper functions
9p: rename fl_type variable in v9fs_file_do_lock
afs: convert to using new filelock helpers
ceph: convert to using new filelock helpers
dlm: convert to using new filelock helpers
gfs2: convert to using new filelock helpers
lockd: convert to using new filelock helpers
nfs: convert to using new filelock helpers
nfsd: convert to using new filelock helpers
ocfs2: convert to using new filelock helpers
smb/client: convert to using new filelock helpers
smb/server: convert to using new filelock helpers
filelock: drop the IS_* macros
filelock: split common fields into struct file_lock_core
filelock: have fs/locks.c deal with file_lock_core directly
filelock: convert more internal functions to use file_lock_core
filelock: make posix_same_owner take file_lock_core pointers
filelock: convert posix_owner_key to take file_lock_core arg
filelock: make locks_{insert,delete}_global_locks take file_lock_core arg
filelock: convert locks_{insert,delete}_global_blocked
filelock: make __locks_delete_block and __locks_wake_up_blocks take file_lock_core
filelock: convert __locks_insert_block, conflict and deadlock checks to use file_lock_core
filelock: convert fl_blocker to file_lock_core
filelock: clean up locks_delete_block internals
filelock: reorganize locks_delete_block and __locks_insert_block
filelock: make assign_type helper take a file_lock_core pointer
filelock: convert locks_wake_up_blocks to take a file_lock_core pointer
filelock: convert locks_insert_lock_ctx and locks_delete_lock_ctx
filelock: convert locks_translate_pid to take file_lock_core
filelock: convert seqfile handling to use file_lock_core
9p: adapt to breakup of struct file_lock
afs: adapt to breakup of struct file_lock
ceph: adapt to breakup of struct file_lock
dlm: adapt to breakup of struct file_lock
gfs2: adapt to breakup of struct file_lock
fuse: adapt to breakup of struct file_lock
lockd: adapt to breakup of struct file_lock
nfs: adapt to breakup of struct file_lock
nfsd: adapt to breakup of struct file_lock
ocfs2: adapt to breakup of struct file_lock
smb/client: adapt to breakup of struct file_lock
smb/server: adapt to breakup of struct file_lock
filelock: remove temporary compatibility macros
filelock: split leases out of struct file_lock
fs/9p/vfs_file.c | 40 +- fs/afs/flock.c | 60 +-- fs/ceph/locks.c | 74 ++-- fs/dlm/plock.c | 44 +-- fs/fuse/file.c | 14 +- fs/gfs2/file.c | 16 +- fs/libfs.c | 2 +- fs/lockd/clnt4xdr.c | 14 +- fs/lockd/clntlock.c | 2 +- fs/lockd/clntproc.c | 65 +-- fs/lockd/clntxdr.c | 14 +- fs/lockd/svc4proc.c | 10 +- fs/lockd/svclock.c | 64 +-- fs/lockd/svcproc.c | 10 +- fs/lockd/svcsubs.c | 24 +- fs/lockd/xdr.c | 14 +- fs/lockd/xdr4.c | 14 +- fs/locks.c | 851 ++++++++++++++++++++++------------------ fs/nfs/delegation.c | 4 +- fs/nfs/file.c | 22 +- fs/nfs/nfs3proc.c | 2 +- fs/nfs/nfs4_fs.h | 2 +- fs/nfs/nfs4file.c | 2 +- fs/nfs/nfs4proc.c | 39 +- fs/nfs/nfs4state.c | 22 +- fs/nfs/nfs4trace.h | 4 +- fs/nfs/nfs4xdr.c | 8 +- fs/nfs/write.c | 8 +- fs/nfsd/filecache.c | 4 +- fs/nfsd/nfs4callback.c | 2 +- fs/nfsd/nfs4layouts.c | 34 +- fs/nfsd/nfs4state.c | 120 +++--- fs/ocfs2/locks.c | 12 +- fs/ocfs2/stack_user.c | 2 +- fs/open.c | 2 +- fs/posix_acl.c | 4 +- fs/smb/client/cifsfs.c | 2 +- fs/smb/client/cifssmb.c | 8 +- fs/smb/client/file.c | 78 ++-- fs/smb/client/smb2file.c | 2 +- fs/smb/server/smb2pdu.c | 44 +-- fs/smb/server/vfs.c | 14 +- include/linux/filelock.h | 103 +++-- include/linux/fs.h | 5 +- include/linux/lockd/lockd.h | 8 +- include/linux/lockd/xdr.h | 2 +- include/trace/events/afs.h | 4 +- include/trace/events/filelock.h | 102 ++--- 48 files changed, 1064 insertions(+), 933 deletions(-)
---
base-commit: e96efe9f69ebb12b38c722c159413fd6850b782c
change-id: 20240116-flsplit-bdb46824db68
Best regards,
Signature · 1 line
Jeff Layton <[email protected]>