| Message ID | 03b3f42bbc92fdd1c798c29451eac66a0576adf1.camel@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL] File locking changes for v5.15 | expand |
The pull request you sent on Fri, 27 Aug 2021 08:49:36 -0400:
> git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git locks-v5.15
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/6f01c935d96cd4eb8bbbc5249bd9a754b6939e0a
Thank you!
The following changes since commit 9ff50bf2f2ff5fab01cac26d8eed21a89308e6ef: Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux (2021-08-21 11:27:16 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git locks-v5.15 for you to fetch changes up to 2949e8427af3bb74a1e26354cb68c1700663c827: fs: clean up after mandatory file locking support removal (2021-08-24 07:52:45 -0400) ---------------------------------------------------------------- Hi Linus, Sending this along early as I don't expect it to change between now and when the merge window opens. This PR starts with a couple of fixes for potential deadlocks in the fowner/fasync handling. The next patch removes the old mandatory locking code from the kernel altogether. The last patch cleans up rw_verify_area a bit more after the mandatory locking removal. Thanks! ---------------------------------------------------------------- Desmond Cheong Zhi Xi (2): fcntl: fix potential deadlocks for &fown_struct.lock fcntl: fix potential deadlock for &fasync_struct.fa_lock Jeff Layton (1): fs: remove mandatory file locking support Lukas Bulwahn (1): fs: clean up after mandatory file locking support removal Documentation/filesystems/mandatory-locking.rst | 188 -------------------------------------------- fs/9p/vfs_file.c | 13 --- fs/Kconfig | 10 --- fs/afs/flock.c | 4 - fs/ceph/locks.c | 3 - fs/fcntl.c | 18 +++-- fs/gfs2/file.c | 3 - fs/locks.c | 117 +-------------------------- fs/namei.c | 4 +- fs/namespace.c | 29 +++---- fs/nfs/file.c | 4 - fs/nfsd/nfs4state.c | 14 ---- fs/nfsd/vfs.c | 23 +----- fs/ocfs2/locks.c | 4 - fs/open.c | 8 +- fs/read_write.c | 17 +--- fs/remap_range.c | 12 --- include/linux/fs.h | 84 -------------------- mm/mmap.c | 6 -- mm/nommu.c | 3 - 20 files changed, 28 insertions(+), 536 deletions(-) delete mode 100644 Documentation/filesystems/mandatory-locking.rst