* [GIT PULL] file locking changes for v6.3
@ 2023-02-16 11:07 Jeff Layton
2023-02-20 20:20 ` pr-tracker-bot
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Layton @ 2023-02-16 11:07 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel, Chuck Lever
[-- Attachment #1: Type: text/plain, Size: 3354 bytes --]
The following changes since commit 1fe4fd6f5cad346e598593af36caeadc4f5d4fa9:
Merge tag 'xfs-6.2-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (2023-01-08 12:11:45 -0600)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git tags/locks-v6.3
for you to fetch changes up to c65454a947263dfdf482076388aaed60af84ca2f:
fs: remove locks_inode (2023-01-11 06:52:43 -0500)
----------------------------------------------------------------
The main change here is that I've broken out most of the file locking
definitions into a new header file. I also went ahead and completed the
removal of locks_inode function.
Note that there was a minor merge conflict with the fuse tree reported
by Stephen Rothwell:
https://lore.kernel.org/lkml/20230127112640.6f55e705@canb.auug.org.au/T/
Cheers,
----------------------------------------------------------------
Jeff Layton (2):
filelock: move file locking definitions to separate header file
fs: remove locks_inode
arch/arm/kernel/sys_oabi-compat.c | 1 +
fs/9p/vfs_file.c | 1 +
fs/afs/flock.c | 14 +-
fs/afs/internal.h | 1 +
fs/attr.c | 1 +
fs/ceph/caps.c | 1 +
fs/ceph/locks.c | 1 +
fs/cifs/cifsfs.c | 1 +
fs/cifs/cifsglob.h | 1 +
fs/cifs/cifssmb.c | 1 +
fs/cifs/file.c | 1 +
fs/cifs/smb2file.c | 1 +
fs/dlm/plock.c | 1 +
fs/fcntl.c | 1 +
fs/file_table.c | 1 +
fs/fuse/file.c | 1 +
fs/gfs2/file.c | 1 +
fs/inode.c | 1 +
fs/ksmbd/smb2pdu.c | 1 +
fs/ksmbd/vfs.c | 1 +
fs/ksmbd/vfs_cache.c | 1 +
fs/lockd/clntlock.c | 2 +-
fs/lockd/clntproc.c | 3 +-
fs/lockd/netns.h | 1 +
fs/locks.c | 29 ++--
fs/namei.c | 1 +
fs/nfs/file.c | 1 +
fs/nfs/nfs4_fs.h | 1 +
fs/nfs/pagelist.c | 1 +
fs/nfs/write.c | 1 +
fs/nfs_common/grace.c | 1 +
fs/nfsd/netns.h | 1 +
fs/nfsd/nfs4state.c | 4 +-
fs/ocfs2/locks.c | 1 +
fs/ocfs2/stack_user.c | 1 +
fs/open.c | 3 +-
fs/orangefs/file.c | 1 +
fs/posix_acl.c | 1 +
fs/proc/fd.c | 1 +
fs/utimes.c | 1 +
fs/xattr.c | 1 +
fs/xfs/xfs_linux.h | 1 +
include/linux/filelock.h | 439 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/fs.h | 429 --------------------------------------------------------
include/linux/lockd/lockd.h | 4 +-
include/linux/lockd/xdr.h | 1 +
46 files changed, 507 insertions(+), 457 deletions(-)
create mode 100644 include/linux/filelock.h
--
Jeff Layton <jlayton@kernel.org>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 862 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [GIT PULL] file locking changes for v6.3
2023-02-16 11:07 [GIT PULL] file locking changes for v6.3 Jeff Layton
@ 2023-02-20 20:20 ` pr-tracker-bot
0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2023-02-20 20:20 UTC (permalink / raw)
To: Jeff Layton; +Cc: Linus Torvalds, linux-kernel, linux-fsdevel, Chuck Lever
The pull request you sent on Thu, 16 Feb 2023 06:07:34 -0500:
> https://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git tags/locks-v6.3
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/575a7e0f812a4968ad1e0c00026692ede040e13f
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-20 20:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-16 11:07 [GIT PULL] file locking changes for v6.3 Jeff Layton
2023-02-20 20:20 ` pr-tracker-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).