Commit 5f375835 authored by Miao Xie's avatar Miao Xie Committed by Chris Mason

Btrfs: move the missing device to its own fs device list

For a missing device, we don't know it belong to which fs before we read its
fsid from the chunk tree. So we add them into the current fs device list at first.
When we get its fsid, we should move them to their own fs device list.
Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 416d7b80
...@@ -5846,10 +5846,10 @@ struct btrfs_device *btrfs_find_device(struct btrfs_fs_info *fs_info, u64 devid, ...@@ -5846,10 +5846,10 @@ struct btrfs_device *btrfs_find_device(struct btrfs_fs_info *fs_info, u64 devid,
} }
static struct btrfs_device *add_missing_dev(struct btrfs_root *root, static struct btrfs_device *add_missing_dev(struct btrfs_root *root,
struct btrfs_fs_devices *fs_devices,
u64 devid, u8 *dev_uuid) u64 devid, u8 *dev_uuid)
{ {
struct btrfs_device *device; struct btrfs_device *device;
struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
device = btrfs_alloc_device(NULL, &devid, dev_uuid); device = btrfs_alloc_device(NULL, &devid, dev_uuid);
if (IS_ERR(device)) if (IS_ERR(device))
...@@ -5986,7 +5986,8 @@ static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key, ...@@ -5986,7 +5986,8 @@ static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key,
} }
if (!map->stripes[i].dev) { if (!map->stripes[i].dev) {
map->stripes[i].dev = map->stripes[i].dev =
add_missing_dev(root, devid, uuid); add_missing_dev(root, root->fs_info->fs_devices,
devid, uuid);
if (!map->stripes[i].dev) { if (!map->stripes[i].dev) {
free_extent_map(em); free_extent_map(em);
return -EIO; return -EIO;
...@@ -6027,7 +6028,8 @@ static void fill_device_from_item(struct extent_buffer *leaf, ...@@ -6027,7 +6028,8 @@ static void fill_device_from_item(struct extent_buffer *leaf,
read_extent_buffer(leaf, device->uuid, ptr, BTRFS_UUID_SIZE); read_extent_buffer(leaf, device->uuid, ptr, BTRFS_UUID_SIZE);
} }
static int open_seed_devices(struct btrfs_root *root, u8 *fsid) static struct btrfs_fs_devices *open_seed_devices(struct btrfs_root *root,
u8 *fsid)
{ {
struct btrfs_fs_devices *fs_devices; struct btrfs_fs_devices *fs_devices;
int ret; int ret;
...@@ -6036,49 +6038,56 @@ static int open_seed_devices(struct btrfs_root *root, u8 *fsid) ...@@ -6036,49 +6038,56 @@ static int open_seed_devices(struct btrfs_root *root, u8 *fsid)
fs_devices = root->fs_info->fs_devices->seed; fs_devices = root->fs_info->fs_devices->seed;
while (fs_devices) { while (fs_devices) {
if (!memcmp(fs_devices->fsid, fsid, BTRFS_UUID_SIZE)) { if (!memcmp(fs_devices->fsid, fsid, BTRFS_UUID_SIZE))
ret = 0; return fs_devices;
goto out;
}
fs_devices = fs_devices->seed; fs_devices = fs_devices->seed;
} }
fs_devices = find_fsid(fsid); fs_devices = find_fsid(fsid);
if (!fs_devices) { if (!fs_devices) {
ret = -ENOENT; if (!btrfs_test_opt(root, DEGRADED))
goto out; return ERR_PTR(-ENOENT);
fs_devices = alloc_fs_devices(fsid);
if (IS_ERR(fs_devices))
return fs_devices;
fs_devices->seeding = 1;
fs_devices->opened = 1;
return fs_devices;
} }
fs_devices = clone_fs_devices(fs_devices); fs_devices = clone_fs_devices(fs_devices);
if (IS_ERR(fs_devices)) { if (IS_ERR(fs_devices))
ret = PTR_ERR(fs_devices); return fs_devices;
goto out;
}
ret = __btrfs_open_devices(fs_devices, FMODE_READ, ret = __btrfs_open_devices(fs_devices, FMODE_READ,
root->fs_info->bdev_holder); root->fs_info->bdev_holder);
if (ret) { if (ret) {
free_fs_devices(fs_devices); free_fs_devices(fs_devices);
fs_devices = ERR_PTR(ret);
goto out; goto out;
} }
if (!fs_devices->seeding) { if (!fs_devices->seeding) {
__btrfs_close_devices(fs_devices); __btrfs_close_devices(fs_devices);
free_fs_devices(fs_devices); free_fs_devices(fs_devices);
ret = -EINVAL; fs_devices = ERR_PTR(-EINVAL);
goto out; goto out;
} }
fs_devices->seed = root->fs_info->fs_devices->seed; fs_devices->seed = root->fs_info->fs_devices->seed;
root->fs_info->fs_devices->seed = fs_devices; root->fs_info->fs_devices->seed = fs_devices;
out: out:
return ret; return fs_devices;
} }
static int read_one_dev(struct btrfs_root *root, static int read_one_dev(struct btrfs_root *root,
struct extent_buffer *leaf, struct extent_buffer *leaf,
struct btrfs_dev_item *dev_item) struct btrfs_dev_item *dev_item)
{ {
struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
struct btrfs_device *device; struct btrfs_device *device;
u64 devid; u64 devid;
int ret; int ret;
...@@ -6092,31 +6101,48 @@ static int read_one_dev(struct btrfs_root *root, ...@@ -6092,31 +6101,48 @@ static int read_one_dev(struct btrfs_root *root,
BTRFS_UUID_SIZE); BTRFS_UUID_SIZE);
if (memcmp(fs_uuid, root->fs_info->fsid, BTRFS_UUID_SIZE)) { if (memcmp(fs_uuid, root->fs_info->fsid, BTRFS_UUID_SIZE)) {
ret = open_seed_devices(root, fs_uuid); fs_devices = open_seed_devices(root, fs_uuid);
if (ret && !(ret == -ENOENT && btrfs_test_opt(root, DEGRADED))) if (IS_ERR(fs_devices))
return ret; return PTR_ERR(fs_devices);
} }
device = btrfs_find_device(root->fs_info, devid, dev_uuid, fs_uuid); device = btrfs_find_device(root->fs_info, devid, dev_uuid, fs_uuid);
if (!device || !device->bdev) { if (!device) {
if (!btrfs_test_opt(root, DEGRADED)) if (!btrfs_test_opt(root, DEGRADED))
return -EIO; return -EIO;
if (!device) { btrfs_warn(root->fs_info, "devid %llu missing", devid);
btrfs_warn(root->fs_info, "devid %llu missing", devid); device = add_missing_dev(root, fs_devices, devid, dev_uuid);
device = add_missing_dev(root, devid, dev_uuid); if (!device)
if (!device) return -ENOMEM;
return -ENOMEM; } else {
} else if (!device->missing) { if (!device->bdev && !btrfs_test_opt(root, DEGRADED))
return -EIO;
if(!device->bdev && !device->missing) {
/* /*
* this happens when a device that was properly setup * this happens when a device that was properly setup
* in the device info lists suddenly goes bad. * in the device info lists suddenly goes bad.
* device->bdev is NULL, and so we have to set * device->bdev is NULL, and so we have to set
* device->missing to one here * device->missing to one here
*/ */
root->fs_info->fs_devices->missing_devices++; device->fs_devices->missing_devices++;
device->missing = 1; device->missing = 1;
} }
/* Move the device to its own fs_devices */
if (device->fs_devices != fs_devices) {
ASSERT(device->missing);
list_move(&device->dev_list, &fs_devices->devices);
device->fs_devices->num_devices--;
fs_devices->num_devices++;
device->fs_devices->missing_devices--;
fs_devices->missing_devices++;
device->fs_devices = fs_devices;
}
} }
if (device->fs_devices != root->fs_info->fs_devices) { if (device->fs_devices != root->fs_info->fs_devices) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment