github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

btrfs: read raid stripe tree from disk

Browse Source 
If we find the raid-stripe-tree on mount, read it from disk. This is
a backward incompatible feature. The rescue=ignorebadroots mount option
will skip this tree.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Johannes Thumshirn 2023-09-14 09:06:57 -07:00 committed by David Sterba
parent ee1293308e
commit 515020900d
4 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/block-rsv.c
View File

@ -356,6 +356,11 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info)
min_items++; min_items++;
} }
if (btrfs_fs_incompat(fs_info, RAID_STRIPE_TREE)) {
num_bytes += btrfs_root_used(&fs_info->stripe_root->root_item);
min_items++;
}
/* /*
* But we also want to reserve enough space so we can do the fallback * But we also want to reserve enough space so we can do the fallback
* global reserve for an unlink, which is an additional * global reserve for an unlink, which is an additional
@ -407,6 +412,7 @@ void btrfs_init_root_block_rsv(struct btrfs_root *root)
case BTRFS_EXTENT_TREE_OBJECTID: case BTRFS_EXTENT_TREE_OBJECTID:
case BTRFS_FREE_SPACE_TREE_OBJECTID: case BTRFS_FREE_SPACE_TREE_OBJECTID:
case BTRFS_BLOCK_GROUP_TREE_OBJECTID: case BTRFS_BLOCK_GROUP_TREE_OBJECTID:
case BTRFS_RAID_STRIPE_TREE_OBJECTID:
root->block_rsv = &fs_info->delayed_refs_rsv; root->block_rsv = &fs_info->delayed_refs_rsv;
break; break;
case BTRFS_ROOT_TREE_OBJECTID: case BTRFS_ROOT_TREE_OBJECTID:

18
fs/btrfs/disk-io.c
View File

@ -1179,6 +1179,8 @@ static struct btrfs_root *btrfs_get_global_root(struct btrfs_fs_info *fs_info,
return btrfs_grab_root(fs_info->block_group_root); return btrfs_grab_root(fs_info->block_group_root);
case BTRFS_FREE_SPACE_TREE_OBJECTID: case BTRFS_FREE_SPACE_TREE_OBJECTID:
return btrfs_grab_root(btrfs_global_root(fs_info, &key)); return btrfs_grab_root(btrfs_global_root(fs_info, &key));
case BTRFS_RAID_STRIPE_TREE_OBJECTID:
return btrfs_grab_root(fs_info->stripe_root);
default: default:
return NULL; return NULL;
} }
@ -1259,6 +1261,7 @@ void btrfs_free_fs_info(struct btrfs_fs_info *fs_info)
btrfs_put_root(fs_info->fs_root); btrfs_put_root(fs_info->fs_root);
btrfs_put_root(fs_info->data_reloc_root); btrfs_put_root(fs_info->data_reloc_root);
btrfs_put_root(fs_info->block_group_root); btrfs_put_root(fs_info->block_group_root);
btrfs_put_root(fs_info->stripe_root);
btrfs_check_leaked_roots(fs_info); btrfs_check_leaked_roots(fs_info);
btrfs_extent_buffer_leak_debug_check(fs_info); btrfs_extent_buffer_leak_debug_check(fs_info);
kfree(fs_info->super_copy); kfree(fs_info->super_copy);
@ -1804,6 +1807,7 @@ static void free_root_pointers(struct btrfs_fs_info *info, bool free_chunk_root)
free_root_extent_buffers(info->fs_root); free_root_extent_buffers(info->fs_root);
free_root_extent_buffers(info->data_reloc_root); free_root_extent_buffers(info->data_reloc_root);
free_root_extent_buffers(info->block_group_root); free_root_extent_buffers(info->block_group_root);
free_root_extent_buffers(info->stripe_root);
if (free_chunk_root) if (free_chunk_root)
free_root_extent_buffers(info->chunk_root); free_root_extent_buffers(info->chunk_root);
} }
@ -2280,6 +2284,20 @@ static int btrfs_read_roots(struct btrfs_fs_info *fs_info)
fs_info->uuid_root = root; fs_info->uuid_root = root;
} }
if (btrfs_fs_incompat(fs_info, RAID_STRIPE_TREE)) {
location.objectid = BTRFS_RAID_STRIPE_TREE_OBJECTID;
root = btrfs_read_tree_root(tree_root, &location);
if (IS_ERR(root)) {
if (!btrfs_test_opt(fs_info, IGNOREBADROOTS)) {
ret = PTR_ERR(root);
goto out;
}
} else {
set_bit(BTRFS_ROOT_TRACK_DIRTY, &root->state);
fs_info->stripe_root = root;
}
}
return 0; return 0;
out: out:
btrfs_warn(fs_info, "failed to read root (objectid=%llu): %d", btrfs_warn(fs_info, "failed to read root (objectid=%llu): %d",

1
fs/btrfs/fs.h
View File

@ -373,6 +373,7 @@ struct btrfs_fs_info {
struct btrfs_root *uuid_root; struct btrfs_root *uuid_root;
struct btrfs_root *data_reloc_root; struct btrfs_root *data_reloc_root;
struct btrfs_root *block_group_root; struct btrfs_root *block_group_root;
struct btrfs_root *stripe_root;
/* The log root tree is a directory of all the other log roots */ /* The log root tree is a directory of all the other log roots */
struct btrfs_root *log_root_tree; struct btrfs_root *log_root_tree;

1
include/uapi/linux/btrfs.h
View File

@ -333,6 +333,7 @@ struct btrfs_ioctl_fs_info_args {
#define BTRFS_FEATURE_INCOMPAT_RAID1C34 (1ULL << 11) #define BTRFS_FEATURE_INCOMPAT_RAID1C34 (1ULL << 11)
#define BTRFS_FEATURE_INCOMPAT_ZONED (1ULL << 12) #define BTRFS_FEATURE_INCOMPAT_ZONED (1ULL << 12)
#define BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2 (1ULL << 13) #define BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2 (1ULL << 13)
#define BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE (1ULL << 14)
struct btrfs_ioctl_feature_flags { struct btrfs_ioctl_feature_flags {
__u64 compat_flags; __u64 compat_flags;