* linux-next: manual merge of the vfs-brauner tree with the exfat tree
@ 2026-11-18 13:20 Mark Brown
2026-11-19 12:11 ` Christian Brauner
2026-11-20 0:35 ` [PATCH linux-next] exfat: check the emergency state in exfat_writeback_range() Sasha Levin
0 siblings, 2 replies; 3+ messages in thread
From: Mark Brown @ 2026-11-18 13:20 UTC (permalink / raw)
To: Christian Brauner
Cc: Chi Zhiling, Linux Kernel Mailing List, Linux Next Mailing List,
Namjae Jeon
[-- Attachment #1: Type: text/plain, Size: 4874 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/exfat/file.c
between commits:
cfdee4e5f5764 ("exfat: coordinate direct writes with mmap faults")
b900c61a3f21b ("exfat: drain dirty pages after forced shutdown")
e70ec3eaac957 ("exfat: increase VDL before unlocking initialized folios")
from the exfat tree (plus my earlier merges) and commit:
788f21d1f1923 ("exfat: don't set SB_RDONLY after filesystem errors")
from the vfs-brauner tree. Again, this needs double checking.
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/exfat/file.c
index 8078e9bccbe13,b985f4e9b314b..0000000000000
--- a/fs/exfat/file.c
+++ b/fs/exfat/file.c
@@@ -1102,13 -899,10 +1123,14 @@@ static ssize_t exfat_file_write_iter(st
loff_t pos, valid_size, end;
int err;
- if (unlikely(exfat_forced_shutdown(inode->i_sb)))
- return -EIO;
+ err = exfat_emergency_state(inode->i_sb);
+ if (unlikely(err))
+ return err;
+ /* Gap initialization and source faults require blocking operations. */
+ if (iocb->ki_flags & IOCB_NOWAIT)
+ return -EAGAIN;
+
inode_lock(inode);
ret = generic_write_checks(iocb, iter);
@@@ -1207,51 -993,58 +1229,52 @@@ static ssize_t exfat_file_read_iter(str
static vm_fault_t exfat_page_mkwrite(struct vm_fault *vmf)
{
struct inode *inode = file_inode(vmf->vma->vm_file);
+ struct address_space *mapping = inode->i_mapping;
struct exfat_inode_info *ei = EXFAT_I(inode);
+ struct folio *folio = page_folio(vmf->page);
+ loff_t fault_start = folio_pos(folio);
+ loff_t new_valid_size, gap_start;
vm_fault_t ret;
- loff_t new_valid_size, mmap_valid_size, fault_page_start;
- int err;
+ int error;
- if (unlikely(exfat_forced_shutdown(inode->i_sb)))
- return VM_FAULT_SIGBUS;
- err = exfat_emergency_state(inode->i_sb);
- if (unlikely(err))
- return vmf_fs_error(err);
-
- if (!inode_trylock(inode))
- return VM_FAULT_RETRY;
-
- mmap_valid_size = ((loff_t)vmf->pgoff + 1) << PAGE_SHIFT;
- fault_page_start = ((loff_t)vmf->pgoff) << PAGE_SHIFT;
- new_valid_size = min(mmap_valid_size, i_size_read(inode));
-
- if (exfat_get_valid_size(ei) < new_valid_size) {
- loff_t zeroed_size = exfat_get_zeroed_size(ei);
-
- if (zeroed_size < fault_page_start) {
- /*
- * Zero only the gap below the faulting page. The read
- * fault populated its folio and iomap_page_mkwrite()
- * will dirty it.
- */
- err = exfat_prepare_valid_range(inode, zeroed_size,
- fault_page_start);
- if (err < 0) {
- inode_unlock(inode);
- return vmf_fs_error(err);
- }
- }
-
- /*
- * Track zeroed_size by block, not page, because writeback stops
- * at i_size recording blocks wholly beyond it could skip a
- * later required zeroing.
- */
- exfat_advance_zeroed_size(ei,
- round_up(new_valid_size, i_blocksize(inode)));
- exfat_set_valid_size(ei, new_valid_size);
- mark_inode_dirty(inode);
- }
++ error = exfat_emergency_state(inode->i_sb);
++ if (unlikely(error))
++ return vmf_fs_error(error);
sb_start_pagefault(inode->i_sb);
- file_update_time(vmf->vma->vm_file);
+ error = file_update_time(vmf->vma->vm_file);
+ if (error) {
+ ret = vmf_fs_error(error);
+ goto out_pagefault;
+ }
+ filemap_invalidate_lock_shared(mapping);
+
+ if (folio->mapping != mapping || fault_start >= i_size_read(inode)) {
+ ret = VM_FAULT_NOPAGE;
+ goto out_unlock;
+ }
+
+ /* The faulting folio is already populated; initialize only its gap. */
+ gap_start = max(exfat_get_valid_size(ei), exfat_get_zeroed_size(ei));
+ error = exfat_prepare_range(inode, gap_start, fault_start, true);
+ if (error) {
+ ret = vmf_fs_error(error);
+ goto out_unlock;
+ }
- filemap_invalidate_lock_shared(inode->i_mapping);
ret = iomap_page_mkwrite(vmf, exfat_iomap_next, NULL);
- filemap_invalidate_unlock_shared(inode->i_mapping);
+ if (ret == VM_FAULT_LOCKED) {
+ /* Buffered write may have grown EOF before we locked the folio. */
+ new_valid_size = min(folio_next_pos(folio), i_size_read(inode));
+ exfat_advance_zeroed_size(ei,
+ round_up(new_valid_size, i_blocksize(inode)));
+ if (exfat_advance_valid_size(ei, new_valid_size))
+ mark_inode_dirty(inode);
+ }
+out_unlock:
+ filemap_invalidate_unlock_shared(mapping);
+out_pagefault:
sb_end_pagefault(inode->i_sb);
- inode_unlock(inode);
return ret;
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the vfs-brauner tree with the exfat tree
2026-11-18 13:20 linux-next: manual merge of the vfs-brauner tree with the exfat tree Mark Brown
@ 2026-11-19 12:11 ` Christian Brauner
2026-11-20 0:35 ` [PATCH linux-next] exfat: check the emergency state in exfat_writeback_range() Sasha Levin
1 sibling, 0 replies; 3+ messages in thread
From: Christian Brauner @ 2026-11-19 12:11 UTC (permalink / raw)
To: Mark Brown
Cc: Chi Zhiling, Linux Kernel Mailing List, Linux Next Mailing List,
Namjae Jeon
On Wed, Nov 18, 2026 at 01:20:56PM +0000, Mark Brown wrote:
> from the vfs-brauner tree. Again, this needs double checking.
Looks right to me. Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH linux-next] exfat: check the emergency state in exfat_writeback_range()
2026-11-18 13:20 linux-next: manual merge of the vfs-brauner tree with the exfat tree Mark Brown
2026-11-19 12:11 ` Christian Brauner
@ 2026-11-20 0:35 ` Sasha Levin
1 sibling, 0 replies; 3+ messages in thread
From: Sasha Levin @ 2026-11-20 0:35 UTC (permalink / raw)
To: Mark Brown
Cc: Christian Brauner, Namjae Jeon, Chi Zhiling,
Linux Next Mailing List, Linux Kernel Mailing List
The vfs.all merge in next-20261119 takes the exfat side in
exfat_writepages(), where b900c61a3f21 ("exfat: drain dirty pages after
forced shutdown") moved the shutdown check into exfat_writeback_range(),
but leaves exfat_writeback_range() with exfat_forced_shutdown(). So the
exfat_emergency_state() check that 788f21d1f192 ("exfat: don't set
SB_RDONLY after filesystem errors") adds to writeback is lost, and after
an error with errors=remount-ro writeback keeps writing dirty data.
next-20261118 had exfat_emergency_state() in exfat_writeback_range().
Put it back.
Fixes: 026bdab726d8 ("Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git")
Link: https://lore.kernel.org/all/av2mOPyANz3H59F5@sirena.org.uk/
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
This is for folding into the vfs.all merge in fs-next. Built fs/exfat on
x86_64 (defconfig plus EXFAT_FS=m, W=1).
fs/exfat/iomap.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/exfat/iomap.c b/fs/exfat/iomap.c
index d0bcf523f48b5..a846fbc450b82 100644
--- a/fs/exfat/iomap.c
+++ b/fs/exfat/iomap.c
@@ -374,14 +374,14 @@ static ssize_t exfat_writeback_range(struct iomap_writepage_ctx *wpc,
struct folio *folio, u64 offset, unsigned int len, u64 end_pos)
{
struct inode *inode = wpc->inode;
+ int error;
- if (exfat_forced_shutdown(inode->i_sb))
- return -EIO;
+ error = exfat_emergency_state(inode->i_sb);
+ if (error)
+ return error;
if (offset < wpc->iomap.offset ||
offset >= wpc->iomap.offset + wpc->iomap.length) {
- int error;
-
error = __exfat_iomap_begin(inode, offset, len,
0, &wpc->iomap, false,
exfat_get_valid_size(EXFAT_I(inode)));
base-commit: adcad7f4e6332cff3d6d7165f41584899f598534
--
2.53.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-20 0:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-18 13:20 linux-next: manual merge of the vfs-brauner tree with the exfat tree Mark Brown
2026-11-19 12:11 ` Christian Brauner
2026-11-20 0:35 ` [PATCH linux-next] exfat: check the emergency state in exfat_writeback_range() Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox