btrfs-progs: test: add new cli-test for subvol get/set-default

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

diff --git a/volumes.c b/volumes.c
index 79dad24..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],
@@ -868,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;
@@ -998,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;
@@ -1132,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;
@@ -1279,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;
@@ -1964,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);