aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/dev-replace.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/dev-replace.c')
-rw-r--r--fs/btrfs/dev-replace.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index b7f5f4aa6e86..1a3d24592859 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -368,7 +368,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root,
368 WARN_ON(!tgt_device); 368 WARN_ON(!tgt_device);
369 dev_replace->tgtdev = tgt_device; 369 dev_replace->tgtdev = tgt_device;
370 370
371 btrfs_info_in_rcu(root->fs_info, 371 btrfs_info_in_rcu(fs_info,
372 "dev_replace from %s (devid %llu) to %s started", 372 "dev_replace from %s (devid %llu) to %s started",
373 src_device->missing ? "<missing disk>" : 373 src_device->missing ? "<missing disk>" :
374 rcu_str_deref(src_device->name), 374 rcu_str_deref(src_device->name),
@@ -394,9 +394,9 @@ int btrfs_dev_replace_start(struct btrfs_root *root,
394 394
395 ret = btrfs_sysfs_add_device_link(tgt_device->fs_devices, tgt_device); 395 ret = btrfs_sysfs_add_device_link(tgt_device->fs_devices, tgt_device);
396 if (ret) 396 if (ret)
397 btrfs_err(root->fs_info, "kobj add dev failed %d\n", ret); 397 btrfs_err(fs_info, "kobj add dev failed %d\n", ret);
398 398
399 btrfs_wait_ordered_roots(root->fs_info, -1); 399 btrfs_wait_ordered_roots(fs_info, -1);
400 400
401 /* force writing the updated state information to disk */ 401 /* force writing the updated state information to disk */
402 trans = btrfs_start_transaction(root, 0); 402 trans = btrfs_start_transaction(root, 0);
@@ -414,7 +414,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root,
414 btrfs_device_get_total_bytes(src_device), 414 btrfs_device_get_total_bytes(src_device),
415 &dev_replace->scrub_progress, 0, 1); 415 &dev_replace->scrub_progress, 0, 1);
416 416
417 ret = btrfs_dev_replace_finishing(root->fs_info, ret); 417 ret = btrfs_dev_replace_finishing(fs_info, ret);
418 /* don't warn if EINPROGRESS, someone else might be running scrub */ 418 /* don't warn if EINPROGRESS, someone else might be running scrub */
419 if (ret == -EINPROGRESS) { 419 if (ret == -EINPROGRESS) {
420 args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS; 420 args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS;