From: Mark Brown <broonie@kernel.org>
To: Christian Brauner <brauner@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Namjae Jeon <linkinjeon@kernel.org>,
Youling Tang <tangyouling@kylinos.cn>
Subject: linux-next: manual merge of the vfs-brauner tree with the exfat tree
Date: Tue, 17 Nov 2026 13:01:42 +0000 [thread overview]
Message-ID: <avxQNpa-V0yefH6d@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2665 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/exfat/inode.c
between commit:
cca94c25250a1 ("exfat: don't map EXFAT_EOF_CLUSTER as a physical cluster")
from the exfat tree and commit:
788f21d1f1923 ("exfat: don't set SB_RDONLY after filesystem errors")
from the vfs-brauner tree. A bit unsure about this one, the actual
conflict is exfat_writepages().
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 --combined fs/exfat/inode.c
index 0bf2f6ba51d29,531560175009e..0000000000000
--- a/fs/exfat/inode.c
+++ b/fs/exfat/inode.c
@@@ -114,8 -114,9 +114,9 @@@ int exfat_write_inode(struct inode *ino
{
int ret;
- if (unlikely(exfat_forced_shutdown(inode->i_sb)))
- return -EIO;
+ ret = exfat_emergency_state(inode->i_sb);
+ if (unlikely(ret))
+ return ret;
mutex_lock(&EXFAT_SB(inode->i_sb)->s_lock);
ret = __exfat_write_inode(inode, wbc->sync_mode == WB_SYNC_ALL);
@@@ -134,9 -135,6 +135,9 @@@ void exfat_sync_inode(struct inode *ino
* Input: inode, (logical) clu_offset, target allocation area
* Output: errcode, cluster number
* *clu = (~0), if it's unable to allocate a new cluster
+ *
+ * For !create, *count is limited to the part of the range backed by the
+ * cluster chain; the caller reports the remainder as a hole.
*/
int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,
unsigned int *clu, unsigned int *count, int create,
@@@ -156,15 -154,9 +157,15 @@@
*count > num_clusters - clu_offset)
num_to_be_allocated = clu_offset + *count - num_clusters;
- if (!create && (num_to_be_allocated > 0)) {
- *clu = EXFAT_EOF_CLUSTER;
- return 0;
+ if (!create && num_to_be_allocated > 0) {
+ if (clu_offset >= num_clusters) {
+ *clu = EXFAT_EOF_CLUSTER;
+ return 0;
+ }
+
+ /* Range straddles the chain end: map the valid prefix only. */
+ *count = num_clusters - clu_offset;
+ num_to_be_allocated = 0;
}
*clu = last_clu = ei->start_clu;
@@@ -291,6 -283,11 +292,6 @@@ static int exfat_writepages(struct addr
.wbc = wbc,
.ops = &exfat_writeback_ops,
};
- int ret;
-
- ret = exfat_emergency_state(mapping->host->i_sb);
- if (unlikely(ret))
- return ret;
return iomap_writepages(&wpc);
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-11-17 13:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 13:01 Mark Brown [this message]
2026-11-17 13:45 ` Christian Brauner
-- strict thread matches above, loose matches on Subject: below --
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=avxQNpa-V0yefH6d@sirena.org.uk \
--to=broonie@kernel.org \
--cc=brauner@kernel.org \
--cc=linkinjeon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tangyouling@kylinos.cn \
/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®