Just the layout change and conversion to accessors (invariable
branch in vfs.git#stable-struct_fd).
One textual conflict (fs/coda/inode.c, resolved by using the current
mainline variant) and two conflicts that are not caught by merge - one in
fs/namespace.c, another - fs/xfs/xfs_exchrange.c; both resolved by replacing
if (!f.file) with if (fd_empty(f)) and other f.file with fd_file(f).
Proposed conflict resolution in
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git #merge-candidate
The following changes since commit 8400291e289ee6b2bf9779ff1c83a291501f017b:
Linux 6.11-rc1 (2024-07-28 14:19:55 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git tags/pull-stable-struct_fd
for you to fetch changes up to de12c3391bce10504c0e7bd767516c74110cfce1:
add struct fd constructors, get rid of __to_fd() (2024-08-12 22:01:15 -0400)
----------------------------------------------------------------
struct fd layout change (and conversion to accessor helpers)
----------------------------------------------------------------
Al Viro (3):
introduce fd_file(), convert all accessors to it.
struct fd: representation change
add struct fd constructors, get rid of __to_fd()
arch/alpha/kernel/osf_sys.c | 4 +-
arch/arm/kernel/sys_oabi-compat.c | 10 +--
arch/powerpc/kvm/book3s_64_vio.c | 4 +-
arch/powerpc/kvm/powerpc.c | 12 +--
arch/powerpc/platforms/cell/spu_syscalls.c | 8 +-
arch/x86/kernel/cpu/sgx/main.c | 4 +-
arch/x86/kvm/svm/sev.c | 16 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 8 +-
drivers/gpu/drm/drm_syncobj.c | 6 +-
drivers/infiniband/core/ucma.c | 6 +-
drivers/infiniband/core/uverbs_cmd.c | 10 +--
drivers/media/mc/mc-request.c | 6 +-
drivers/media/rc/lirc_dev.c | 8 +-
drivers/vfio/group.c | 6 +-
drivers/vfio/virqfd.c | 6 +-
drivers/virt/acrn/irqfd.c | 6 +-
drivers/xen/privcmd.c | 10 +--
fs/btrfs/ioctl.c | 4 +-
fs/coda/inode.c | 4 +-
fs/eventfd.c | 4 +-
fs/eventpoll.c | 30 ++++----
fs/ext4/ioctl.c | 6 +-
fs/f2fs/file.c | 6 +-
fs/fcntl.c | 38 +++++-----
fs/fhandle.c | 4 +-
fs/file.c | 26 +++----
fs/fsopen.c | 6 +-
fs/fuse/dev.c | 6 +-
fs/ioctl.c | 30 ++++----
fs/kernel_read_file.c | 4 +-
fs/locks.c | 14 ++--
fs/namei.c | 10 +--
fs/namespace.c | 12 +--
fs/notify/fanotify/fanotify_user.c | 12 +--
fs/notify/inotify/inotify_user.c | 12 +--
fs/ocfs2/cluster/heartbeat.c | 6 +-
fs/open.c | 24 +++---
fs/overlayfs/file.c | 68 +++++++++--------
fs/quota/quota.c | 8 +-
fs/read_write.c | 118 ++++++++++++++---------------
fs/readdir.c | 20 ++---
fs/remap_range.c | 2 +-
fs/select.c | 8 +-
fs/signalfd.c | 6 +-
fs/smb/client/ioctl.c | 8 +-
fs/splice.c | 22 +++---
fs/stat.c | 8 +-
fs/statfs.c | 4 +-
fs/sync.c | 14 ++--
fs/timerfd.c | 8 +-
fs/utimes.c | 4 +-
fs/xattr.c | 36 ++++-----
fs/xfs/xfs_exchrange.c | 4 +-
fs/xfs/xfs_handle.c | 6 +-
fs/xfs/xfs_ioctl.c | 28 +++----
include/linux/cleanup.h | 2 +-
include/linux/file.h | 53 ++++++-------
io_uring/sqpoll.c | 10 +--
ipc/mqueue.c | 50 ++++++------
kernel/bpf/bpf_inode_storage.c | 14 ++--
kernel/bpf/btf.c | 6 +-
kernel/bpf/syscall.c | 42 +++++-----
kernel/bpf/token.c | 10 +--
kernel/cgroup/cgroup.c | 4 +-
kernel/events/core.c | 14 ++--
kernel/module/main.c | 2 +-
kernel/nsproxy.c | 12 +--
kernel/pid.c | 10 +--
kernel/signal.c | 6 +-
kernel/sys.c | 10 +--
kernel/taskstats.c | 4 +-
kernel/watch_queue.c | 4 +-
mm/fadvise.c | 4 +-
mm/filemap.c | 6 +-
mm/memcontrol-v1.c | 12 +--
mm/readahead.c | 10 +--
net/core/net_namespace.c | 6 +-
net/socket.c | 14 ++--
security/integrity/ima/ima_main.c | 4 +-
security/landlock/syscalls.c | 22 +++---
security/loadpin/loadpin.c | 4 +-
sound/core/pcm_native.c | 6 +-
virt/kvm/eventfd.c | 6 +-
virt/kvm/vfio.c | 8 +-
84 files changed, 559 insertions(+), 556 deletions(-)
