Re: linux-next: manual merge of the vfs-brauner tree with the exfat tree
From: Christian Brauner
Date: Tue Nov 17 2026 - 08:45:55 EST
On Tue, Nov 17, 2026 at 01:01:42PM +0000, Mark Brown wrote:
> from the vfs-brauner tree. A bit unsure about this one, the actual
> conflict is exfat_writepages().
Thanks for fixing this up. Dropping the check from exfat_writepages() is
right. There's a small fixup needed on top of your resolution:
diff --git a/fs/exfat/file.c b/fs/exfat/file.c
--- a/fs/exfat/file.c
+++ b/fs/exfat/file.c
@@ -1002,9 +1002,6 @@ static vm_fault_t exfat_page_mkwrite(struct vm_fault *vmf)
if (unlikely(err))
return vmf_fs_error(err);
- if (exfat_forced_shutdown(inode->i_sb))
- return vmf_fs_error(-EIO);
-
if (!inode_trylock(inode))
return VM_FAULT_RETRY;
diff --git a/fs/exfat/iomap.c b/fs/exfat/iomap.c
--- a/fs/exfat/iomap.c
+++ b/fs/exfat/iomap.c
@@ -250,9 +250,11 @@ 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 err;
- if (exfat_forced_shutdown(inode->i_sb))
- return -EIO;
+ err = exfat_emergency_state(inode->i_sb);
+ if (unlikely(err))
+ return err;
if (offset < wpc->iomap.offset ||
offset >= wpc->iomap.offset + wpc->iomap.length) {
Thanks!
--