XFS: Fixes for v7.4-rc4
Carlos Maiolino
maintainerHello Linus,
Could you please pull patches included in the tag below?
Mostly this pull includes fixes for a few races, an ordering problem during init/teardown of proc/sysfs, missing locks, etc.
Also important to mention there is a patch for fs/iomap in this series which Brauner is aware and agreed for it to go through xfs tree as it is a dependency for the subsequent xfs patches.
This pull will create a conflict in fs/xfs/xfs_file.c as it clashes with the following commit:9e8fc16dc6b4 ("iomap: pass iomap_iter_next_fn directly instead of struct iomap_ops")
If it helps this is how I solved the conflict:
fs/xfs/xfs_file.c +0 -0
@@@ -1980,11 -2039,22 +2040,22 @@@ __xfs_write_fault lock_mode =XFS_MMAPLOCK_EXCL ; }
- if (IS_DAX(inode))
+ /*
+ * The caller picked the zoned or the regular path with no lock held. + * The realtime flag cannot change under the MMAPLOCK, so look at it + * again, and start over if it has changed. + */
+ if (xfs_is_zoned_inode(ip) != !!ac) {
+ xfs_warn_ratelimited(ip->i_mount,
+ "RT flag modifying during page fault for inode 0x%llx.",
+ inode->i_ino);
+ ret = VM_FAULT_NOPAGE;
+ } else if (IS_DAX(inode)) {
ret = xfs_dax_fault_locked(vmf, order, true);- else
+ } else {
- ret = iomap_page_mkwrite(vmf, &xfs_buffered_write_iomap_ops,
+ ret = iomap_page_mkwrite(vmf, xfs_buffered_write_iomap_next,
ac);
+ }
xfs_iunlock(ip, lock_mode);
sb_end_pagefault(inode->i_sb);Thanks,
Carlos
"The following changes since commit 7ba9663607b31108b4350b604a3c85ae86c67c19:
xfs: kill xfs_trans_set/clear_context() helpers (2026-11-03 15:39:53 +0100)
are available in the Git repository at:
git://git.kernel.org:/pub/scm/fs/xfs/xfs-linux.git tags/xfs-fixes-7.4-rc4
for you to fetch changes up to 855abf2cf8cd69a248362ca4b518de9387dd6bf5:
xfs: test for realtime and reflink under the pNFS locks (2026-11-16 11:45:49 +0100)
----------------------------------------------------------------
xfs: fixes for Linux v7.4-rc4
----------------------------------------------------------------
Chris Mason (11):
xfs: don't skip the flush before shifting extents
xfs: flush the shifted range before changing the file
xfs: don't change the block map under a dirty folio
iomap: don't punch delalloc under a dirty EOF block
xfs: test for reflink after the dio write checks
xfs: test for always COW after the dio write checks
xfs: refuse fallocate racing with realtime flag changes
xfs: take the MMAPLOCK in xfs_fileattr_set()
xfs: restart faults racing with realtime flag changes
xfs: don't enable DAX on zoned inodes
xfs: test for realtime and reflink under the pNFS locks
Christoph Hellwig (2):
xfs: always call xfs_update_stable_writes in xfs_ioctl_setattr_xflags
xfs: refuse writes to files racing with realtime inode flag changes
Daejun Park (2):
xfs: break layouts before swapping extents
xfs: wait for direct I/O before swapping extents
Eric Sandeen (1):
xfs: properly order xfsstats proc/sysfs init and teardown
Hengyu Liang (1):
xfs: fix f_bfree underflow in statfs()
Rik van Riel (1):
xfs: keep successful near rt allocations
Yiqing Wu (2):
xfs: remove unused variable in xchk_stats_estimate_bufsize()
xfs: remove unused variable in xrep_tempfile_copyin()
fs/iomap/buffered-io.c | 34 +++++++++++-- fs/xfs/scrub/stats.c | 3 +- fs/xfs/scrub/tempfile.c | 3 +- fs/xfs/xfs_bmap_util.c | 30 ++++++++---- fs/xfs/xfs_file.c | 123 ++++++++++++++++++++++++++++++++++++++---------- fs/xfs/xfs_inode.c | 3 +- fs/xfs/xfs_ioctl.c | 27 ++++++++--- fs/xfs/xfs_iops.c | 4 ++ fs/xfs/xfs_pnfs.c | 32 +++++++------ fs/xfs/xfs_reflink.c | 2 +- fs/xfs/xfs_rtalloc.c | 6 ++- fs/xfs/xfs_super.c | 24 +++++----- 12 files changed, 212 insertions(+), 79 deletions(-)"
The pull request you sent on Sat, 21 Nov 2026 20:42:06 +0100:
The pull request you sent on Sat, 21 Nov 2026 20:42:06 +0100:
Quoted 1 line
git://git.kernel.org:/pub/scm/fs/xfs/xfs-linux.gittags/xfs-fixes-7.4-rc4
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f802b6558eb81bd5888d761a0cdc8afe5fd8c941
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html