mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Christian Brauner <brauner@kernel.org>
Cc: Chi Zhiling <chizhiling@kylinos.cn>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Namjae Jeon <linkinjeon@kernel.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the exfat tree
Date: Wed, 18 Nov 2026 13:20:56 +0000	[thread overview]
Message-ID: <av2mOPyANz3H59F5@sirena.org.uk> (raw)

[-- 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 --]

             reply	other threads:[~2026-11-18 13:21 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18 13:20 Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-11-17 13:01 Mark Brown
2026-11-17 13:45 ` Christian Brauner
2026-11-17 23:45   ` Mark Brown
2026-10-13 13:21 Mark Brown
2026-10-13 13:21 Mark Brown
2026-03-27 17:35 Mark Brown
2026-03-28  1:01 ` Namjae Jeon
2024-08-11 22:10 Stephen Rothwell
2024-08-12  0:54 ` Namjae Jeon
2024-09-16 22:22 ` Stephen Rothwell
2024-09-17  6:44   ` Namjae Jeon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=av2mOPyANz3H59F5@sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=brauner@kernel.org \
    --cc=chizhiling@kylinos.cn \
    --cc=linkinjeon@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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®