btrfs-progs: image: introduce symbolic names for the sanitization modes

[platform/upstream/btrfs-progs.git] / volumes.c

diff --git a/volumes.c b/volumes.c
index db8b931..2fde476 100644 (file)
--- a/volumes.c
+++ b/volumes.c
@@ -138,7 +138,21 @@ static int device_list_add(const char *path,
                list_add(&device->dev_list, &fs_devices->devices);
                device->fs_devices = fs_devices;
        } else if (!device->name || strcmp(device->name, path)) {
-               char *name = strdup(path);
+               char *name;
+
+               /*
+                * The existing device has newer generation, so this one could
+                * be a stale one, don't add it.
+                */
+               if (found_transid < device->generation) {
+                       warning(
+       "adding device %s gen %llu but found an existing device %s gen %llu",
+                               path, found_transid, device->name,
+                               device->generation);
+                       return -EEXIST;
+               }
+
+               name = strdup(path);
                 if (!name)
                         return -ENOMEM;
                 kfree(device->name);
@@ -505,8 +519,9 @@ err:
        return ret;
 }
 
-static int find_next_chunk(struct btrfs_root *root, u64 objectid, u64 *offset)
+static int find_next_chunk(struct btrfs_fs_info *fs_info, u64 *offset)
 {
+       struct btrfs_root *root = fs_info->chunk_root;
        struct btrfs_path *path;
        int ret;
        struct btrfs_key key;
@@ -517,7 +532,7 @@ static int find_next_chunk(struct btrfs_root *root, u64 objectid, u64 *offset)
        if (!path)
                return -ENOMEM;
 
-       key.objectid = objectid;
+       key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
        key.offset = (u64)-1;
        key.type = BTRFS_CHUNK_ITEM_KEY;
 
@@ -533,7 +548,7 @@ static int find_next_chunk(struct btrfs_root *root, u64 objectid, u64 *offset)
        } else {
                btrfs_item_key_to_cpu(path->nodes[0], &found_key,
                                      path->slots[0]);
-               if (found_key.objectid != objectid)
+               if (found_key.objectid != BTRFS_FIRST_CHUNK_TREE_OBJECTID)
                        *offset = 0;
                else {
                        chunk = btrfs_item_ptr(path->nodes[0], path->slots[0],
@@ -585,7 +600,7 @@ error:
  * the btrfs_device struct should be fully filled in
  */
 int btrfs_add_device(struct btrfs_trans_handle *trans,
-                    struct btrfs_root *root,
+                    struct btrfs_fs_info *fs_info,
                     struct btrfs_device *device)
 {
        int ret;
@@ -593,11 +608,10 @@ int btrfs_add_device(struct btrfs_trans_handle *trans,
        struct btrfs_dev_item *dev_item;
        struct extent_buffer *leaf;
        struct btrfs_key key;
+       struct btrfs_root *root = fs_info->chunk_root;
        unsigned long ptr;
        u64 free_devid = 0;
 
-       root = root->fs_info->chunk_root;
-
        path = btrfs_alloc_path();
        if (!path)
                return -ENOMEM;
@@ -635,7 +649,7 @@ int btrfs_add_device(struct btrfs_trans_handle *trans,
        ptr = (unsigned long)btrfs_device_uuid(dev_item);
        write_extent_buffer(leaf, device->uuid, ptr, BTRFS_UUID_SIZE);
        ptr = (unsigned long)btrfs_device_fsid(dev_item);
-       write_extent_buffer(leaf, root->fs_info->fsid, ptr, BTRFS_UUID_SIZE);
+       write_extent_buffer(leaf, fs_info->fsid, ptr, BTRFS_UUID_SIZE);
        btrfs_mark_buffer_dirty(leaf);
        ret = 0;
 
@@ -690,11 +704,10 @@ out:
        return ret;
 }
 
-int btrfs_add_system_chunk(struct btrfs_root *root,
-                          struct btrfs_key *key,
+int btrfs_add_system_chunk(struct btrfs_fs_info *fs_info, struct btrfs_key *key,
                           struct btrfs_chunk *chunk, int item_size)
 {
-       struct btrfs_super_block *super_copy = root->fs_info->super_copy;
+       struct btrfs_super_block *super_copy = fs_info->super_copy;
        struct btrfs_disk_key disk_key;
        u32 array_size;
        u8 *ptr;
@@ -835,11 +848,11 @@ error:
                                / sizeof(struct btrfs_stripe) + 1)
 
 int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
-                     struct btrfs_root *extent_root, u64 *start,
+                     struct btrfs_fs_info *info, u64 *start,
                      u64 *num_bytes, u64 type)
 {
        u64 dev_offset;
-       struct btrfs_fs_info *info = extent_root->fs_info;
+       struct btrfs_root *extent_root = info->extent_root;
        struct btrfs_root *chunk_root = info->chunk_root;
        struct btrfs_stripe *stripes;
        struct btrfs_device *device = NULL;
@@ -870,10 +883,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
                return -ENOSPC;
        }
 
-       if (type & (BTRFS_BLOCK_GROUP_RAID0 | BTRFS_BLOCK_GROUP_RAID1 |
-                   BTRFS_BLOCK_GROUP_RAID5 | BTRFS_BLOCK_GROUP_RAID6 |
-                   BTRFS_BLOCK_GROUP_RAID10 |
-                   BTRFS_BLOCK_GROUP_DUP)) {
+       if (type & BTRFS_BLOCK_GROUP_PROFILE_MASK) {
                if (type & BTRFS_BLOCK_GROUP_SYSTEM) {
                        calc_size = SZ_8M;
                        max_chunk_size = calc_size * 2;
@@ -1000,8 +1010,7 @@ again:
                }
                return -ENOSPC;
        }
-       ret = find_next_chunk(chunk_root, BTRFS_FIRST_CHUNK_TREE_OBJECTID,
-                             &offset);
+       ret = find_next_chunk(info, &offset);
        if (ret)
                return ret;
        key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
@@ -1083,7 +1092,7 @@ again:
        BUG_ON(ret);
 
        if (type & BTRFS_BLOCK_GROUP_SYSTEM) {
-               ret = btrfs_add_system_chunk(chunk_root, &key,
+               ret = btrfs_add_system_chunk(info, &key,
                                    chunk, btrfs_chunk_item_size(num_stripes));
                BUG_ON(ret);
        }
@@ -1101,11 +1110,11 @@ again:
  * occupied.
  */
 int btrfs_alloc_data_chunk(struct btrfs_trans_handle *trans,
-                          struct btrfs_root *extent_root, u64 *start,
+                          struct btrfs_fs_info *info, u64 *start,
                           u64 num_bytes, u64 type, int convert)
 {
        u64 dev_offset;
-       struct btrfs_fs_info *info = extent_root->fs_info;
+       struct btrfs_root *extent_root = info->extent_root;
        struct btrfs_root *chunk_root = info->chunk_root;
        struct btrfs_stripe *stripes;
        struct btrfs_device *device = NULL;
@@ -1134,9 +1143,7 @@ int btrfs_alloc_data_chunk(struct btrfs_trans_handle *trans,
        } else {
                u64 tmp;
 
-               ret = find_next_chunk(chunk_root,
-                                     BTRFS_FIRST_CHUNK_TREE_OBJECTID,
-                                     &tmp);
+               ret = find_next_chunk(info, &tmp);
                key.offset = tmp;
                if (ret)
                        return ret;
@@ -1281,6 +1288,8 @@ int btrfs_next_bg(struct btrfs_fs_info *fs_info, u64 *logical,
                        *size = ce->size;
                        return 0;
                }
+               if (!cur)
+                       ce = next_cache_extent(ce);
        }
 
        return -ENOENT;
@@ -1637,11 +1646,11 @@ btrfs_find_device_by_devid(struct btrfs_fs_devices *fs_devices,
        return NULL;
 }
 
-int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset)
+int btrfs_chunk_readonly(struct btrfs_fs_info *fs_info, u64 chunk_offset)
 {
        struct cache_extent *ce;
        struct map_lookup *map;
-       struct btrfs_mapping_tree *map_tree = &root->fs_info->mapping_tree;
+       struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree;
        int readonly = 0;
        int i;
 
@@ -1650,7 +1659,7 @@ int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset)
         * corresponding chunk, we will rebuild it later
         */
        ce = search_cache_extent(&map_tree->cache_tree, chunk_offset);
-       if (!root->fs_info->is_chunk_recover)
+       if (!fs_info->is_chunk_recover)
                BUG_ON(!ce);
        else
                return 0;
@@ -1966,9 +1975,12 @@ int btrfs_read_sys_array(struct btrfs_fs_info *fs_info)
        u32 cur_offset;
        struct btrfs_key key;
 
-       sb = btrfs_find_create_tree_block(fs_info,
-                                         BTRFS_SUPER_INFO_OFFSET,
-                                         BTRFS_SUPER_INFO_SIZE);
+       if (fs_info->nodesize < BTRFS_SUPER_INFO_SIZE) {
+               printf("ERROR: nodesize %u too small to read superblock\n",
+                               fs_info->nodesize);
+               return -EINVAL;
+       }
+       sb = btrfs_find_create_tree_block(fs_info, BTRFS_SUPER_INFO_OFFSET);
        if (!sb)
                return -ENOMEM;
        btrfs_set_buffer_uptodate(sb);