mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
btrfs: add helper for device path or missing
This patch creates a helper function to get either the rcu device path or missing. Signed-off-by: Anand Jain <anand.jain@oracle.com> [ rename to btrfs_dev_name, switch to if/else ] Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
38b5f68e98
commit
3c958bd23b
1 changed files with 14 additions and 11 deletions
|
@ -304,6 +304,14 @@ void btrfs_after_dev_replace_commit(struct btrfs_fs_info *fs_info)
|
||||||
dev_replace->cursor_left_last_write_of_item;
|
dev_replace->cursor_left_last_write_of_item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static char* btrfs_dev_name(struct btrfs_device *device)
|
||||||
|
{
|
||||||
|
if (device->missing)
|
||||||
|
return "<missing disk>";
|
||||||
|
else
|
||||||
|
return rcu_str_deref(device->name);
|
||||||
|
}
|
||||||
|
|
||||||
int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
|
int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
|
||||||
const char *tgtdev_name, u64 srcdevid, const char *srcdev_name,
|
const char *tgtdev_name, u64 srcdevid, const char *srcdev_name,
|
||||||
int read_src)
|
int read_src)
|
||||||
|
@ -363,8 +371,7 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
|
||||||
|
|
||||||
btrfs_info_in_rcu(fs_info,
|
btrfs_info_in_rcu(fs_info,
|
||||||
"dev_replace from %s (devid %llu) to %s started",
|
"dev_replace from %s (devid %llu) to %s started",
|
||||||
src_device->missing ? "<missing disk>" :
|
btrfs_dev_name(src_device),
|
||||||
rcu_str_deref(src_device->name),
|
|
||||||
src_device->devid,
|
src_device->devid,
|
||||||
rcu_str_deref(tgt_device->name));
|
rcu_str_deref(tgt_device->name));
|
||||||
|
|
||||||
|
@ -538,8 +545,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
|
||||||
} else {
|
} else {
|
||||||
btrfs_err_in_rcu(fs_info,
|
btrfs_err_in_rcu(fs_info,
|
||||||
"btrfs_scrub_dev(%s, %llu, %s) failed %d",
|
"btrfs_scrub_dev(%s, %llu, %s) failed %d",
|
||||||
src_device->missing ? "<missing disk>" :
|
btrfs_dev_name(src_device),
|
||||||
rcu_str_deref(src_device->name),
|
|
||||||
src_device->devid,
|
src_device->devid,
|
||||||
rcu_str_deref(tgt_device->name), scrub_ret);
|
rcu_str_deref(tgt_device->name), scrub_ret);
|
||||||
btrfs_dev_replace_unlock(dev_replace, 1);
|
btrfs_dev_replace_unlock(dev_replace, 1);
|
||||||
|
@ -557,8 +563,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
|
||||||
|
|
||||||
btrfs_info_in_rcu(fs_info,
|
btrfs_info_in_rcu(fs_info,
|
||||||
"dev_replace from %s (devid %llu) to %s finished",
|
"dev_replace from %s (devid %llu) to %s finished",
|
||||||
src_device->missing ? "<missing disk>" :
|
btrfs_dev_name(src_device),
|
||||||
rcu_str_deref(src_device->name),
|
|
||||||
src_device->devid,
|
src_device->devid,
|
||||||
rcu_str_deref(tgt_device->name));
|
rcu_str_deref(tgt_device->name));
|
||||||
tgt_device->is_tgtdev_for_dev_replace = 0;
|
tgt_device->is_tgtdev_for_dev_replace = 0;
|
||||||
|
@ -814,12 +819,10 @@ static int btrfs_dev_replace_kthread(void *data)
|
||||||
progress = btrfs_dev_replace_progress(fs_info);
|
progress = btrfs_dev_replace_progress(fs_info);
|
||||||
progress = div_u64(progress, 10);
|
progress = div_u64(progress, 10);
|
||||||
btrfs_info_in_rcu(fs_info,
|
btrfs_info_in_rcu(fs_info,
|
||||||
"continuing dev_replace from %s (devid %llu) to %s @%u%%",
|
"continuing dev_replace from %s (devid %llu) to target %s @%u%%",
|
||||||
dev_replace->srcdev->missing ? "<missing disk>"
|
btrfs_dev_name(dev_replace->srcdev),
|
||||||
: rcu_str_deref(dev_replace->srcdev->name),
|
|
||||||
dev_replace->srcdev->devid,
|
dev_replace->srcdev->devid,
|
||||||
dev_replace->tgtdev ? rcu_str_deref(dev_replace->tgtdev->name)
|
btrfs_dev_name(dev_replace->tgtdev),
|
||||||
: "<missing target disk>",
|
|
||||||
(unsigned int)progress);
|
(unsigned int)progress);
|
||||||
|
|
||||||
btrfs_dev_replace_continue_on_mount(fs_info);
|
btrfs_dev_replace_continue_on_mount(fs_info);
|
||||||
|
|
Loading…
Reference in a new issue