]> git.hungrycats.org Git - btrfs-progs/commitdiff
btrfs-progs: do not write a NULL remap root during mkfs topics/mkfs-remap-tree
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Tue, 13 Oct 2026 07:18:57 +0000 (03:18 -0400)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Fri, 16 Oct 2026 08:03:19 +0000 (04:03 -0400)
create_metadata_block_groups() commits before setup_remap_tree_root()
has created the remap tree, and write_ctree_super() dereferenced
fs_info->remap_root->node unconditionally: mkfs -O remap-tree segfaulted.
Leave the superblock remap root fields alone until the node exists.

Fixes: 9f887733b34e ("btrfs-progs: write remap root details to superblock")
Assisted-by: Claude:claude-opus-5-5
kernel-shared/disk-io.c

index 385b74bbac3ca8ed5ee652a863538e8f8756dff5..f1ec0216f942476b25a4a929d11e73a97e8d519d 100644 (file)
@@ -2306,7 +2306,8 @@ int write_ctree_super(struct btrfs_trans_handle *trans)
        btrfs_set_super_chunk_root_generation(fs_info->super_copy,
                                btrfs_header_generation(chunk_root->node));
 
-       if (btrfs_fs_incompat(fs_info, REMAP_TREE)) {
+       /* mkfs commits before setup_remap_tree_root() has created the node */
+       if (btrfs_fs_incompat(fs_info, REMAP_TREE) && remap_root->node) {
                btrfs_set_super_remap_root(fs_info->super_copy,
                                           remap_root->node->start);
                btrfs_set_super_remap_root_level(fs_info->super_copy,