| Message ID | 20240308-vfs-filelock-5711cd242ea9@brauner (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL] vfs filelock | expand |
The pull request you sent on Fri, 8 Mar 2024 11:15:17 +0100:
> git@gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs tags/vfs-6.9.file
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0c750012e8f30d26930ae13e815635258aee92b3
Thank you!
Hey Linus, /* Summary */ A few years ago struct file_lock_context was added to allow for separate lists to track different types of file locks instead of using a singly-linked list for all of them. Now leases no longer need to be tracked using struct file_lock. However, a lot of the infrastructure is identical for leases and locks so separating them isn't trivial. This pull request splits a group of fields used by both file locks and leases into a new struct file_lock_core. The new core struct is embedded in struct file_lock. Coccinelle was used to convert a lot of the callers to deal with the move, with the remaining 25% or so converted by hand. Afterwards several internal functions in fs/locks.c are made to work with struct file_lock_core. Ultimately this allows to split struct file_lock into struct file_lock and struct file_lease. The file lease APIs are then converted to take struct file_lease. /* Testing */ clang: Debian clang version 16.0.6 (19) gcc: (Debian 13.2.0-7) 13.2.0 All patches are based on v6.8-rc1 and have been sitting in linux-next. No build failures or warnings were observed. /* Conflicts */ Merge conflicts with other trees ================================ [1] linux-next: manual merge of the vfs-brauner tree with the nfsd tree https://lore.kernel.org/linux-next/20240207114118.23541d8c@canb.auug.org.au [2] linux-next: manual merge of the vfs-brauner tree with the cifs tree https://lore.kernel.org/linux-next/20240208095906.18567844@canb.auug.org.au [3] linux-next: build failure after merge of the vfs-brauner tree https://lore.kernel.org/linux-next/20240219104450.4d258995@canb.auug.org.au [4] linux-next: manual merge of the vfs-brauner tree with the fuse tree https://lore.kernel.org/linux-next/20240307102332.6793fbc7@canb.auug.org.au Merge conflicts with mainline ============================= No known conflicts. The following changes since commit 6613476e225e090cc9aad49be7fa504e290dd33d: Linux 6.8-rc1 (2024-01-21 14:11:32 -0800) are available in the Git repository at: git@gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs tags/vfs-6.9.file for you to fetch changes up to 14786d949a3b8cf00cc32456363b7db22894a0e6: filelock: fix deadlock detection in POSIX locking (2024-02-20 09:53:33 +0100) Please consider pulling these changes from the signed vfs-6.9.file tag. Thanks! Christian ---------------------------------------------------------------- vfs-6.9.file ---------------------------------------------------------------- Christian Brauner (1): Merge series 'filelock: split file leases out of struct file_lock' of https://lore.kernel.org/r/20240131-flsplit-v3-0-c6129007ee8d@kernel.org Jeff Layton (50): 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 filelock: don't do security checks on nfsd setlease calls filelock: always define for_each_file_lock() filelock: fix deadlock detection in POSIX locking NeilBrown (1): smb: remove redundant check 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 | 894 ++++++++++++++++++++++------------------ 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 | 35 +- fs/nfsd/nfs4state.c | 124 +++--- 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 | 5 +- 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 | 129 ++++-- 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, 1117 insertions(+), 957 deletions(-)