btrfs-progs: update CHANGES for v4.16.1

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

diff --git a/volumes.c b/volumes.c
index 00acaa0..c6e3432 100644 (file)
--- a/volumes.c
+++ b/volumes.c
@@ -120,14 +120,22 @@ static inline int nr_data_stripes(struct map_lookup *map)
 
 static LIST_HEAD(fs_uuids);
 
-static struct btrfs_device *__find_device(struct list_head *head, u64 devid,
-                                         u8 *uuid)
+/*
+ * Find a device specified by @devid or @uuid in the list of @fs_devices, or
+ * return NULL.
+ *
+ * If devid and uuid are both specified, the match must be exact, otherwise
+ * only devid is used.
+ */
+static struct btrfs_device *find_device(struct btrfs_fs_devices *fs_devices,
+               u64 devid, u8 *uuid)
 {
+       struct list_head *head = &fs_devices->devices;
        struct btrfs_device *dev;
 
        list_for_each_entry(dev, head, dev_list) {
                if (dev->devid == devid &&
-                   !memcmp(dev->uuid, uuid, BTRFS_UUID_SIZE)) {
+                   (!uuid || !memcmp(dev->uuid, uuid, BTRFS_UUID_SIZE))) {
                        return dev;
                }
        }
@@ -166,7 +174,7 @@ static int device_list_add(const char *path,
                fs_devices->lowest_devid = (u64)-1;
                device = NULL;
        } else {
-               device = __find_device(&fs_devices->devices, devid,
+               device = find_device(fs_devices, devid,
                                       disk_super->dev_item.uuid);
        }
        if (!device) {
@@ -516,10 +524,10 @@ out:
 }
 
 static int find_free_dev_extent(struct btrfs_device *device, u64 num_bytes,
-                               u64 *start)
+                               u64 *start, u64 *len)
 {
        /* FIXME use last free of some kind */
-       return find_free_dev_extent_start(device, num_bytes, 0, start, NULL);
+       return find_free_dev_extent_start(device, num_bytes, 0, start, len);
 }
 
 static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
@@ -543,7 +551,7 @@ static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
         * is responsible to make sure it's free.
         */
        if (!convert) {
-               ret = find_free_dev_extent(device, num_bytes, start);
+               ret = find_free_dev_extent(device, num_bytes, start, NULL);
                if (ret)
                        goto err;
        }
@@ -1682,8 +1690,7 @@ struct btrfs_device *btrfs_find_device(struct btrfs_fs_info *fs_info, u64 devid,
                if (!fsid ||
                    (!memcmp(cur_devices->fsid, fsid, BTRFS_UUID_SIZE) ||
                     fs_info->ignore_fsid_mismatch)) {
-                       device = __find_device(&cur_devices->devices,
-                                              devid, uuid);
+                       device = find_device(cur_devices, devid, uuid);
                        if (device)
                                return device;
                }