* linux-next: manual merge of the xfs tree with the origin tree
@ 2026-11-17 11:54 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2026-11-17 11:54 UTC (permalink / raw)
To: David Chinner, Carlos Maiolino, linux-xfs
Cc: Chris Mason, Christian Brauner, Joanne Koong,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1700 bytes --]
Hi all,
Today's linux-next merge of the xfs tree got a conflict in:
fs/xfs/xfs_file.c
between commit:
9e8fc16dc6b47 ("iomap: pass iomap_iter_next_fn directly instead of struct iomap_ops")
from the origin tree and commit:
03cbbd80a3e70 ("xfs: restart faults racing with realtime flag changes")
from the xfs tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc fs/xfs/xfs_file.c
index d61ea8e2c8e40,8070a07e601f5..0000000000000
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@@ -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);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-11-17 11:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-17 11:54 linux-next: manual merge of the xfs tree with the origin tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®