* [PATCH 1/3] btrfs: derive f_fsid from on-disk fsuuid and dev_t
2026-02-26 14:23 [PATCH 0/3] fix s_uuid and f_fsid consistency for cloned filesystems Anand Jain
@ 2026-02-26 14:27 ` Anand Jain
2026-09-11 12:32 ` Dave Hansen
2026-02-26 14:27 ` [PATCH 2/3] btrfs: use on-disk uuid for s_uuid in temp_fsid mounts Anand Jain
` (2 subsequent siblings)
3 siblings, 1 reply; 14+ messages in thread
From: Anand Jain @ 2026-02-26 14:27 UTC (permalink / raw)
To: linux-btrfs
Currently, f_fsid depends on fs_devices->fsid. For cloned devices, this
value is dynamic and fluctuates across mount cycles. This inconsistency
breaks persistence for subsystems like IMA.
Switch to a stable derivation using the persistent on-disk fsuuid +
root id + devt of the block device for the single device filesystem.
This is consistent as long as the device remains unchanged/replace
(excludes btrfs device replace secnario for now).
Signed-off-by: Anand Jain <asj@kernel.org>
---
fs/btrfs/super.c | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 125fca57c164..68473663fe1e 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1733,7 +1733,7 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
u64 total_free_data = 0;
u64 total_free_meta = 0;
u32 bits = fs_info->sectorsize_bits;
- __be32 *fsid = (__be32 *)fs_info->fs_devices->fsid;
+ __be32 *fsid;
unsigned factor = 1;
struct btrfs_block_rsv *block_rsv = &fs_info->global_block_rsv;
int ret;
@@ -1819,15 +1819,34 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
buf->f_bsize = fs_info->sectorsize;
buf->f_namelen = BTRFS_NAME_LEN;
- /* We treat it as constant endianness (it doesn't matter _which_)
- because we want the fsid to come out the same whether mounted
- on a big-endian or little-endian host */
+ /*
+ * fs_devices->fsid is dynamically generated when temp_fsid is active
+ * to support cloned devices. Use the original on-disk fsid instead,
+ * as it remains consistent across mount cycles.
+ */
+ fsid = (__be32 *)fs_info->super_copy->fsid;
+ /*
+ * We treat it as constant endianness (it doesn't matter _which_)
+ * because we want the fsid to come out the same whether mounted
+ * on a big-endian or little-endian host.
+ */
buf->f_fsid.val[0] = be32_to_cpu(fsid[0]) ^ be32_to_cpu(fsid[2]);
buf->f_fsid.val[1] = be32_to_cpu(fsid[1]) ^ be32_to_cpu(fsid[3]);
/* Mask in the root object ID too, to disambiguate subvols */
buf->f_fsid.val[0] ^= btrfs_root_id(BTRFS_I(d_inode(dentry))->root) >> 32;
buf->f_fsid.val[1] ^= btrfs_root_id(BTRFS_I(d_inode(dentry))->root);
+ /*
+ * dev_t provides way to differentiate mounted cloned devices keeps
+ * the statfs fid is consistent and unique.
+ */
+ if (fs_info->fs_devices->total_devices == 1) {
+ __kernel_fsid_t dev_fsid = \
+ u64_to_fsid(huge_encode_dev(fs_info->fs_devices->latest_dev->bdev->bd_dev));
+ buf->f_fsid.val[0] ^= dev_fsid.val[1];
+ buf->f_fsid.val[1] ^= dev_fsid.val[0];
+ }
+
return 0;
}
--
2.43.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 1/3] btrfs: derive f_fsid from on-disk fsuuid and dev_t
2026-02-26 14:27 ` [PATCH 1/3] btrfs: derive f_fsid from on-disk fsuuid and dev_t Anand Jain
@ 2026-09-11 12:32 ` Dave Hansen
2026-09-11 14:51 ` Anand Suveer Jain
0 siblings, 1 reply; 14+ messages in thread
From: Dave Hansen @ 2026-09-11 12:32 UTC (permalink / raw)
To: Anand Jain, linux-btrfs, David Sterba, David Woodhouse,
Macieira, Thiago
On 2/26/26 06:27, Anand Jain wrote:
> Currently, f_fsid depends on fs_devices->fsid. For cloned devices, this
> value is dynamic and fluctuates across mount cycles. This inconsistency
> breaks persistence for subsystems like IMA.
>
> Switch to a stable derivation using the persistent on-disk fsuuid +
> root id + devt of the block device for the single device filesystem.
> This is consistent as long as the device remains unchanged/replace
> (excludes btrfs device replace secnario for now).
This commit evidently hit 7.2 and is causing end users some real pain.
Real software uses the FSID to encrypt/decrypt their VPN key files:
https://github.com/NetworkManager/NetworkManager-openconnect/
When this gets applied, those users suddenly can't connect to their VPN
any more. Having a stable derivation does seem like a good idea, of
course. Is there any way to make this transition without breaking
existing userspace and existing users?
It looks like this is also getting -stable backports.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] btrfs: derive f_fsid from on-disk fsuuid and dev_t
2026-09-11 12:32 ` Dave Hansen
@ 2026-09-11 14:51 ` Anand Suveer Jain
2026-09-11 16:07 ` Thiago Macieira
2026-09-11 17:23 ` David Sterba
0 siblings, 2 replies; 14+ messages in thread
From: Anand Suveer Jain @ 2026-09-11 14:51 UTC (permalink / raw)
To: Dave Hansen
Cc: sashal, linux-btrfs, David Woodhouse, David Sterba,
Macieira, Thiago
On 11/9/26 20:32, Dave Hansen wrote:
> On 2/26/26 06:27, Anand Jain wrote:
>> Currently, f_fsid depends on fs_devices->fsid. For cloned devices, this
>> value is dynamic and fluctuates across mount cycles. This inconsistency
>> breaks persistence for subsystems like IMA.
>>
>> Switch to a stable derivation using the persistent on-disk fsuuid +
>> root id + devt of the block device for the single device filesystem.
>> This is consistent as long as the device remains unchanged/replace
>> (excludes btrfs device replace secnario for now).
>
> This commit evidently hit 7.2 and is causing end users some real pain.
> Real software uses the FSID to encrypt/decrypt their VPN key files:
>
> https://github.com/NetworkManager/NetworkManager-openconnect/
>
> When this gets applied, those users suddenly can't connect to their VPN
> any more. Having a stable derivation does seem like a good idea, of
> course. Is there any way to make this transition without breaking
> existing userspace and existing users?
>
> It looks like this is also getting -stable backports.
>
>
Dave,
Thanks for the report.
I wish I had more clarity on how OpenConnect uses the FSID before I
comment. Do you know? Can you shed some light on this?
Also, a couple of quick checks:
Is the underlying device MAJ:MIN changing before and after the upgrade?
Are the original and cloned Btrfs filesystems mounted simultaneously?
Patch v3 (1/2) keeps the FSID persistent from the on-disk superblock and
stops exposing the internal random FSID. However, if OpenConnect relies
on statfs.f_fsid, patch v3 (2/2) now derives f_fsid from the underlying
MAJ:MIN.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] btrfs: derive f_fsid from on-disk fsuuid and dev_t
2026-09-11 14:51 ` Anand Suveer Jain
@ 2026-09-11 16:07 ` Thiago Macieira
2026-09-11 18:12 ` David Woodhouse
2026-09-11 17:23 ` David Sterba
1 sibling, 1 reply; 14+ messages in thread
From: Thiago Macieira @ 2026-09-11 16:07 UTC (permalink / raw)
To: Dave Hansen, Anand Suveer Jain
Cc: sashal, linux-btrfs, David Woodhouse, David Sterba
[-- Attachment #1: Type: text/plain, Size: 2465 bytes --]
On Friday, 11 September 2026 07:51:16 Pacific Daylight Time Anand Suveer Jain
wrote:
> I wish I had more clarity on how OpenConnect uses the FSID before I
> comment. Do you know? Can you shed some light on this?
It's openconnect's option --key-password-from-fsid. It uses the FSID encoded
in hex format as the key's passphrase.
To reproduce, take any key without a password and do:
openssl rsa -in unencrypted-key.pem -out encrypted-key.pem
And paste your FSID as the password.
This is not real security, we all agree. David W can probably remember better
why this option exists, but I would suspect it was an IT mandate that a) the
key not be left unencrypted on disk and b) be specific to a given machine,
avoiding reuse by being copied to another. Ideally, we'd use TPM these days,
but there are still a lot of systems without it where Linux runs, and
especially a lot of legacy set ups.
But very simply, it's the fact that the FSID has been used as a stable
identifier and no longer is if the device in question is not itself stable.
> Also, a couple of quick checks:
>
> Is the underlying device MAJ:MIN changing before and after the upgrade?
Unknown. It's LVM and I don't know if the order of activation of LVs is
guaranteed. I wouldn't rely on it. I'll tell you next time I reboot if the
order is the same as this:
brw-rw---- 1 root disk 254, 0 Sep 7 20:28 cr-auto-1
brw-rw---- 1 root disk 254, 1 Sep 7 20:28 system-root
brw-rw---- 1 root disk 254, 2 Sep 7 20:28 system-swap
brw-rw---- 1 root disk 254, 3 Sep 7 20:28 system-pool_tmeta
brw-rw---- 1 root disk 254, 4 Sep 7 20:28 system-pool_tdata
brw-rw---- 1 root disk 254, 5 Sep 7 20:28 system-pool-tpool
brw-rw---- 1 root disk 254, 6 Sep 7 20:28 system-pool
brw-rw---- 1 root disk 254, 7 Sep 7 20:28 system-stuff
brw-rw---- 1 root disk 254, 8 Sep 7 20:28 system-home
brw-rw---- 1 root disk 254, 9 Sep 7 20:28 system-stuff2
Either way, the point is that it changed from 7.1 when the MAJ:MIN was not
mixed in.
> Are the original and cloned Btrfs filesystems mounted simultaneously?
No cloning is involved.
> Patch v3 (1/2) keeps the FSID persistent from the on-disk superblock and
> stops exposing the internal random FSID. However, if OpenConnect relies
> on statfs.f_fsid, patch v3 (2/2) now derives f_fsid from the underlying
> MAJ:MIN.
--
Thiago Macieira - thiago.macieira (AT) intel.com
Principal Engineer - Intel DCG - Platform & Sys. Eng.
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5176 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] btrfs: derive f_fsid from on-disk fsuuid and dev_t
2026-09-11 16:07 ` Thiago Macieira
@ 2026-09-11 18:12 ` David Woodhouse
2026-09-12 10:10 ` Anand Suveer Jain
0 siblings, 1 reply; 14+ messages in thread
From: David Woodhouse @ 2026-09-11 18:12 UTC (permalink / raw)
To: Thiago Macieira, Dave Hansen, Anand Suveer Jain
Cc: sashal, linux-btrfs, David Sterba
On 11 September 2026 17:07:29 BST, Thiago Macieira <thiago.macieira@intel.com> wrote:
>On Friday, 11 September 2026 07:51:16 Pacific Daylight Time Anand Suveer Jain
>wrote:
>> I wish I had more clarity on how OpenConnect uses the FSID before I
>> comment. Do you know? Can you shed some light on this?
>
>It's openconnect's option --key-password-from-fsid. It uses the FSID encoded
>in hex format as the key's passphrase.
>
>To reproduce, take any key without a password and do:
> openssl rsa -in unencrypted-key.pem -out encrypted-key.pem
>And paste your FSID as the password.
>
>This is not real security, we all agree. David W can probably remember better
>why this option exists, but I would suspect it was an IT mandate that a) the
>key not be left unencrypted on disk and b) be specific to a given machine,
>avoiding reuse by being copied to another. Ideally, we'd use TPM these days,
>but there are still a lot of systems without it where Linux runs, and
>especially a lot of legacy set ups.
>
>But very simply, it's the fact that the FSID has been used as a stable
>identifier and no longer is if the device in question is not itself stable.
Right. This was never "security" per se.
In the early days of OpenConnect we were required by Intel IT to match the level of security of the Windows key store. Which basically meant that it would not prevent an *attacker* but would prevent a genuine user who hasn't read (or chooses not to obey) the security policy and wants to copy certificates from one machine to another... for at least five minutes (downloading Jailbreak, in the Windows case, and re-encrying the key, in the Linux case).
It's not high security but it *does* mean that a key file can't *trivially* be copied from machine to machine. Or recovered in useable form from a backup.
Encrypting it with the FSID of the file system it's stored on did a reasonable job of what it was intended to achieve. And the FSID is supposed to be *stable* and not break on a kernel upgrade. (Isn't it part of the NHS FH too, or is that derived entirely differently?)
Of course, you *should* have moved on to using a TPM by now; I don't buy the excuse that it isn't available. But still, the kernel shouldn't break userspace *even* if you deserve it for still using this hack in 2026.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] btrfs: derive f_fsid from on-disk fsuuid and dev_t
2026-09-11 18:12 ` David Woodhouse
@ 2026-09-12 10:10 ` Anand Suveer Jain
0 siblings, 0 replies; 14+ messages in thread
From: Anand Suveer Jain @ 2026-09-12 10:10 UTC (permalink / raw)
To: David Woodhouse, Thiago Macieira, Dave Hansen
Cc: sashal, linux-btrfs, David Sterba
On 12/9/26 02:12, David Woodhouse wrote:
> On 11 September 2026 17:07:29 BST, Thiago Macieira <thiago.macieira@intel.com> wrote:
>> On Friday, 11 September 2026 07:51:16 Pacific Daylight Time Anand Suveer Jain
>> wrote:
>>> I wish I had more clarity on how OpenConnect uses the FSID before I
>>> comment. Do you know? Can you shed some light on this?
>>
>> It's openconnect's option --key-password-from-fsid. It uses the FSID encoded
>> in hex format as the key's passphrase.
>>
>> To reproduce, take any key without a password and do:
>> openssl rsa -in unencrypted-key.pem -out encrypted-key.pem
>> And paste your FSID as the password.
>>
>> This is not real security, we all agree. David W can probably remember better
>> why this option exists, but I would suspect it was an IT mandate that a) the
>> key not be left unencrypted on disk and b) be specific to a given machine,
>> avoiding reuse by being copied to another. Ideally, we'd use TPM these days,
>> but there are still a lot of systems without it where Linux runs, and
>> especially a lot of legacy set ups.
>>
>> But very simply, it's the fact that the FSID has been used as a stable
>> identifier and no longer is if the device in question is not itself stable.
>
> Right. This was never "security" per se.
>
> In the early days of OpenConnect we were required by Intel IT to match the level of security of the Windows key store. Which basically meant that it would not prevent an *attacker* but would prevent a genuine user who hasn't read (or chooses not to obey) the security policy and wants to copy certificates from one machine to another... for at least five minutes (downloading Jailbreak, in the Windows case, and re-encrying the key, in the Linux case).
>
> It's not high security but it *does* mean that a key file can't *trivially* be copied from machine to machine. Or recovered in useable form from a backup.
>
Got it.
> Encrypting it with the FSID of the file system it's stored on did a reasonable job of what it was intended to achieve. And the FSID is supposed to be *stable* and not break on a kernel upgrade. (Isn't it part of the NHS FH too, or is that derived entirely differently?)
>
Are you referring to NFS file handles? That already works fine
for non-cloned Btrfs. The whole point of this patch was to keep
fsid consistent across mounts for cloned filesystems too, but
it turned out to break backward compatibility for the original
filesystem.
Besides, I don't think your approach works with XFS or F2FS
either or at least it hasn't been tested with dynamic disk
discovery? Both of those derive fsid from dev_t MAJ:MIN,
which isn't guaranteed to stay stable across reboots.
> Of course, you *should* have moved on to using a TPM by now; I don't buy the excuse that it isn't available. But still, the kernel shouldn't break userspace *even* if you deserve it for still using this hack in 2026.
Fair point the patch definitely isn't ready for Stable
kernel as-is. I'll get a backport-friendly fix out asap.
Thanks
Anand
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] btrfs: derive f_fsid from on-disk fsuuid and dev_t
2026-09-11 14:51 ` Anand Suveer Jain
2026-09-11 16:07 ` Thiago Macieira
@ 2026-09-11 17:23 ` David Sterba
2026-09-12 10:19 ` Anand Suveer Jain
1 sibling, 1 reply; 14+ messages in thread
From: David Sterba @ 2026-09-11 17:23 UTC (permalink / raw)
To: Anand Suveer Jain
Cc: Dave Hansen, sashal, linux-btrfs, David Woodhouse, David Sterba,
Macieira, Thiago
On Fri, Sep 11, 2026 at 10:51:16PM +0800, Anand Suveer Jain wrote:
> On 11/9/26 20:32, Dave Hansen wrote:
> > On 2/26/26 06:27, Anand Jain wrote:
> >> Currently, f_fsid depends on fs_devices->fsid. For cloned devices, this
> >> value is dynamic and fluctuates across mount cycles. This inconsistency
> >> breaks persistence for subsystems like IMA.
> >>
> >> Switch to a stable derivation using the persistent on-disk fsuuid +
> >> root id + devt of the block device for the single device filesystem.
> >> This is consistent as long as the device remains unchanged/replace
> >> (excludes btrfs device replace secnario for now).
> >
> > This commit evidently hit 7.2 and is causing end users some real pain.
> > Real software uses the FSID to encrypt/decrypt their VPN key files:
> >
> > https://github.com/NetworkManager/NetworkManager-openconnect/
> >
> > When this gets applied, those users suddenly can't connect to their VPN
> > any more. Having a stable derivation does seem like a good idea, of
> > course. Is there any way to make this transition without breaking
> > existing userspace and existing users?
> >
> > It looks like this is also getting -stable backports.
>
> I wish I had more clarity on how OpenConnect uses the FSID before I
> comment. Do you know? Can you shed some light on this?
>
>
> Also, a couple of quick checks:
>
> Is the underlying device MAJ:MIN changing before and after the upgrade?
>
> Are the original and cloned Btrfs filesystems mounted simultaneously?
>
> Patch v3 (1/2) keeps the FSID persistent from the on-disk superblock and
> stops exposing the internal random FSID. However, if OpenConnect relies
> on statfs.f_fsid, patch v3 (2/2) now derives f_fsid from the underlying
> MAJ:MIN.
You've sent the fsid patches [1] to fix some IMA and fanotify problems,
so I guess there's a use case. This report shows a clear breakage in a
different use case, I'm thinking about a quick revert as it seems to
have worse consequences. A fix to make both work would be good but I
can't estimate when it'll be ready so for now I'd go for a revert and
then forward it to 7.2 stable tree.
[1] https://lore.kernel.org/linux-btrfs/cover.1772095546.git.asj@kernel.org/
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] btrfs: derive f_fsid from on-disk fsuuid and dev_t
2026-09-11 17:23 ` David Sterba
@ 2026-09-12 10:19 ` Anand Suveer Jain
0 siblings, 0 replies; 14+ messages in thread
From: Anand Suveer Jain @ 2026-09-12 10:19 UTC (permalink / raw)
To: dsterba, Anand Suveer Jain
Cc: Dave Hansen, sashal, linux-btrfs, David Woodhouse, David Sterba,
Macieira, Thiago
On 12/9/26 01:23, David Sterba wrote:
> On Fri, Sep 11, 2026 at 10:51:16PM +0800, Anand Suveer Jain wrote:
>> On 11/9/26 20:32, Dave Hansen wrote:
>>> On 2/26/26 06:27, Anand Jain wrote:
>>>> Currently, f_fsid depends on fs_devices->fsid. For cloned devices, this
>>>> value is dynamic and fluctuates across mount cycles. This inconsistency
>>>> breaks persistence for subsystems like IMA.
>>>>
>>>> Switch to a stable derivation using the persistent on-disk fsuuid +
>>>> root id + devt of the block device for the single device filesystem.
>>>> This is consistent as long as the device remains unchanged/replace
>>>> (excludes btrfs device replace secnario for now).
>>>
>>> This commit evidently hit 7.2 and is causing end users some real pain.
>>> Real software uses the FSID to encrypt/decrypt their VPN key files:
>>>
>>> https://github.com/NetworkManager/NetworkManager-openconnect/
>>>
>>> When this gets applied, those users suddenly can't connect to their VPN
>>> any more. Having a stable derivation does seem like a good idea, of
>>> course. Is there any way to make this transition without breaking
>>> existing userspace and existing users?
>>>
>>> It looks like this is also getting -stable backports.
>>
>> I wish I had more clarity on how OpenConnect uses the FSID before I
>> comment. Do you know? Can you shed some light on this?
>>
>>
>> Also, a couple of quick checks:
>>
>> Is the underlying device MAJ:MIN changing before and after the upgrade?
>>
>> Are the original and cloned Btrfs filesystems mounted simultaneously?
>>
>> Patch v3 (1/2) keeps the FSID persistent from the on-disk superblock and
>> stops exposing the internal random FSID. However, if OpenConnect relies
>> on statfs.f_fsid, patch v3 (2/2) now derives f_fsid from the underlying
>> MAJ:MIN.
>
> You've sent the fsid patches [1] to fix some IMA and fanotify problems,
> so I guess there's a use case. This report shows a clear breakage in a
> different use case, I'm thinking about a quick revert as it seems to
> have worse consequences. A fix to make both work would be good but I
> can't estimate when it'll be ready so for now I'd go for a revert and
> then forward it to 7.2 stable tree.
>
> [1] https://lore.kernel.org/linux-btrfs/cover.1772095546.git.asj@kernel.org/
Dave,
I'm currently testing the changes below, which limit the new fsid
behavior (deriving it from dev_t) strictly to cloned Btrfs.
If all goes well, I'll post the patch or will update how it goes
by EOD . Thanks!
------------
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 464129b1b0d4..ddb620ac241b 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1836,8 +1836,12 @@ static int btrfs_statfs(struct dentry *dentry,
struct kstatfs *buf)
f_fsid.val[0] ^= btrfs_root_id(BTRFS_I(d_inode(dentry))->root)
>> 32;
f_fsid.val[1] ^= btrfs_root_id(BTRFS_I(d_inode(dentry))->root);
- /* Hash dev_t to avoid f_fsid collision with cloned filesystems. */
- if (fs_info->fs_devices->total_devices == 1) {
+ /*
+ * Hash dev_t to avoid f_fsid collisions with cloned filesystems.
+ * Only do this when a clone is present so the original filesystem
+ * (mounted first) maintains backward-compatible f_fsid behavior.
+ */
+ if (fs_info->fs_devices->temp_fsid) {
__kernel_fsid_t dev_fsid =
u64_to_fsid(huge_encode_dev(fs_info->fs_devices->latest_dev->bdev->bd_dev));
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/3] btrfs: use on-disk uuid for s_uuid in temp_fsid mounts
2026-02-26 14:23 [PATCH 0/3] fix s_uuid and f_fsid consistency for cloned filesystems Anand Jain
2026-02-26 14:27 ` [PATCH 1/3] btrfs: derive f_fsid from on-disk fsuuid and dev_t Anand Jain
@ 2026-02-26 14:27 ` Anand Jain
2026-03-04 13:28 ` [PATCH 0/3] fix s_uuid and f_fsid consistency for cloned filesystems Christoph Hellwig
2026-03-22 20:31 ` Theodore Tso
3 siblings, 0 replies; 14+ messages in thread
From: Anand Jain @ 2026-02-26 14:27 UTC (permalink / raw)
To: linux-btrfs
When mounting a cloned filesystem with a temporary fsuuid (temp_fsid),
layered modules like overlayfs require a persistent identifier.
While internal in-memory fs_devices->fsid must remain dynamic to
distinguish the clone from the source, s_uuid should reflect the
original on-disk UUID to provide consistency for upper-layer consumers.
Signed-off-by: Anand Jain <asj@kernel.org>
---
fs/btrfs/disk-io.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 15c4fdaff3de..98387516ef5b 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3443,7 +3443,8 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device
/* Update the values for the current filesystem. */
sb->s_blocksize = sectorsize;
sb->s_blocksize_bits = blksize_bits(sectorsize);
- memcpy(&sb->s_uuid, fs_info->fs_devices->fsid, BTRFS_FSID_SIZE);
+ /* Copy on-disk uuid, even for temp_fsid mounts */
+ memcpy(&sb->s_uuid, fs_info->super_copy->fsid, BTRFS_FSID_SIZE);
mutex_lock(&fs_info->chunk_mutex);
ret = btrfs_read_sys_array(fs_info);
--
2.43.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 0/3] fix s_uuid and f_fsid consistency for cloned filesystems
2026-02-26 14:23 [PATCH 0/3] fix s_uuid and f_fsid consistency for cloned filesystems Anand Jain
2026-02-26 14:27 ` [PATCH 1/3] btrfs: derive f_fsid from on-disk fsuuid and dev_t Anand Jain
2026-02-26 14:27 ` [PATCH 2/3] btrfs: use on-disk uuid for s_uuid in temp_fsid mounts Anand Jain
@ 2026-03-04 13:28 ` Christoph Hellwig
2026-03-05 9:32 ` Anand Jain
2026-03-22 20:31 ` Theodore Tso
3 siblings, 1 reply; 14+ messages in thread
From: Christoph Hellwig @ 2026-03-04 13:28 UTC (permalink / raw)
To: Anand Jain; +Cc: linux-btrfs, linux-ext4
On Thu, Feb 26, 2026 at 10:23:32PM +0800, Anand Jain wrote:
> This series resolves the tradeoff by aligning btrfs and ext4 behaviour
> with XFS: f_fsid incorporates device identity (devt) to remain unique
> across clones, while s_uuid is preserved consistently matching the on-disk
> uuid.
While I like fixing this up, switching the f_fsid construction to a
different method might break things. Is there a way to only change
it for cloned file systems to reduce the surface of this change?
> Patches
> -------
> Patch 1/3: btrfs: fix f_fsid to include rootid and devt
> Patch 2/3: btrfs: fix s_uuid to be stable across mounts for cloned filesystems
> Patch 3/3: ext4: fix f_fsid to use devt instead of s_uuid
I don't really see that patch 3 in my inbox on linux-btrfs.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/3] fix s_uuid and f_fsid consistency for cloned filesystems
2026-03-04 13:28 ` [PATCH 0/3] fix s_uuid and f_fsid consistency for cloned filesystems Christoph Hellwig
@ 2026-03-05 9:32 ` Anand Jain
2026-03-05 14:21 ` Christoph Hellwig
0 siblings, 1 reply; 14+ messages in thread
From: Anand Jain @ 2026-03-05 9:32 UTC (permalink / raw)
To: Christoph Hellwig, Anand Jain; +Cc: linux-btrfs, linux-ext4
On 4/3/26 21:28, Christoph Hellwig wrote:
> On Thu, Feb 26, 2026 at 10:23:32PM +0800, Anand Jain wrote:
>> This series resolves the tradeoff by aligning btrfs and ext4 behaviour
>> with XFS: f_fsid incorporates device identity (devt) to remain unique
>> across clones, while s_uuid is preserved consistently matching the on-disk
>> uuid.
>
> While I like fixing this up, switching the f_fsid construction to a
> different method might break things. Is there a way to only change
> it for cloned file systems to reduce the surface of this change?
The problem is that we won't know which filesystem is the original
and which is the clone. Generally, the first one mounted is treated
as the original and the following one as the clone. However, f_fsid
should remain consistent regardless of mount order, at least for
the duration that the block device is connected (or until a
system reboot).
>> Patches
>> -------
>> Patch 1/3: btrfs: fix f_fsid to include rootid and devt
>> Patch 2/3: btrfs: fix s_uuid to be stable across mounts for cloned filesystems
>> Patch 3/3: ext4: fix f_fsid to use devt instead of s_uuid
>
> I don't really see that patch 3 in my inbox on linux-btrfs.
My bad, I sent the btrfs/ext4 patches only to their respective
mailing lists. I'll copy both in v2.
Here it is:
https://lore.kernel.org/linux-ext4/e269a49eed2de23eb9f9bd7f506f0fe47696a023.1772095546.git.asj@kernel.org/
Thanks, Anand
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/3] fix s_uuid and f_fsid consistency for cloned filesystems
2026-03-05 9:32 ` Anand Jain
@ 2026-03-05 14:21 ` Christoph Hellwig
0 siblings, 0 replies; 14+ messages in thread
From: Christoph Hellwig @ 2026-03-05 14:21 UTC (permalink / raw)
To: Anand Jain; +Cc: Christoph Hellwig, Anand Jain, linux-btrfs, linux-ext4
On Thu, Mar 05, 2026 at 05:32:36PM +0800, Anand Jain wrote:
> The problem is that we won't know which filesystem is the original
> and which is the clone. Generally, the first one mounted is treated
> as the original and the following one as the clone. However, f_fsid
> should remain consistent regardless of mount order, at least for
> the duration that the block device is connected (or until a
> system reboot).
Then maybe we need to make the new sane behavior dependent on a
feature flag so that only newly created file systems use it?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/3] fix s_uuid and f_fsid consistency for cloned filesystems
2026-02-26 14:23 [PATCH 0/3] fix s_uuid and f_fsid consistency for cloned filesystems Anand Jain
` (2 preceding siblings ...)
2026-03-04 13:28 ` [PATCH 0/3] fix s_uuid and f_fsid consistency for cloned filesystems Christoph Hellwig
@ 2026-03-22 20:31 ` Theodore Tso
3 siblings, 0 replies; 14+ messages in thread
From: Theodore Tso @ 2026-03-22 20:31 UTC (permalink / raw)
To: Anand Jain; +Cc: linux-btrfs, linux-ext4
On Thu, Feb 26, 2026 at 10:23:32PM +0800, Anand Jain wrote:
>
> | s_uuid f_fsid
> --------------|---------------------------
> EXT4 | same same
> Btrfs | random random
> XFS | same f(devt)
> EXT4-patched | same f(devt)
> Btrfs-patched | same f(s_uuid,rootid,devt)
I don't *object* to changing ext4 reports since having something that
is unique is probably better. However, my bigger concern is using
f_fsid in the first place. It's only 64 bits, and that's really not
enough to gaurantee uniqueness. And even as you've proposed to change
things, it's not consistent across file systems. In particular, your
proposed solution mixes s_uuid into btrfs-patched, but not
ext4-patched. Why?
> Problem
> -------
> Btrfs currently never duplicates s_uuid or f_fsid for cloned filesystems.
> When an fsid collision is detected at mount time, btrfs generates a new
> in-memory fsid (temp_fsid), but this is ephemeral — it changes on every
> mount. This has two consequences:
>
> 1. IMA (Integrity Measurement Architecture) cannot reliably track the
> filesystem across mount-cycle, since the f_fsid it sees keeps changing.
> This does not scale. Whereas on the otherhand if you have same s_uuid
> on multiple filesystems, monitoring per distint filesystem is lost.
The problem with using f(dev_t) for IMA is that if you have a
removable device (e.g., an SD card), reporting f_fsid as purely being
a function of dev_t means that the if an SD card ejected, and replaced
with another, the fsid_t will manifestly *not* be unique. So in that
sense, replace f(dev_t) with f(s_uuid) would be worse if you think
"file system unique id" should be unique in the case of removable
storage devices.
If the audit log includes mounts and unmounts, then this might not be
fatal. But if less-than intelligent system administrator or LLM tries
to analyize an audit log using tools like "grep", it would be pretty
easy for someone to get misled.
I know you were primarily interested in cloned file systems, but I
think we also need to take into account other cases, including ones
where there might be more the file system associated with a block
device over time.
> 2. If we instead allow cloned filesystems to share the same f_fsid (as
> ext4 currently does), fanotify loses the ability to distinguish
> between distinct filesystem instances. FAN_EVENT_INFO_TYPE_FID events
> will fail to resolve to the correct mountpoint when f_fsid values
> are identical across clones.
My personal opinion is that f_fsuid is just a terrible interface, the
fact that IMA and fanotify used this is regrettable. I understand why
it happened, because there wasn't anything better, and for many use
cases, it's good enough. But not all.
So I hope we can just actively discourage anyone else using it. Given
that exactly it has not been standardized, across different operating
systems, and different file systems for Linux --- hopefully most
people will have already made that choice.
- Ted
^ permalink raw reply [flat|nested] 14+ messages in thread