diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-08-17 10:41:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-08-17 10:41:59 +0200 |
commit | 5461bd81bf7f86503f393b0b1d57e69b1f1bd44e (patch) | |
tree | 25ec4a2f43019c4d7cc76eb6a967ec450add9401 /fs/btrfs/dev-replace.c | |
parent | 949163015ce6fdb76a5e846a3582d3c40c23c001 (diff) | |
parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
download | lwn-5461bd81bf7f86503f393b0b1d57e69b1f1bd44e.tar.gz lwn-5461bd81bf7f86503f393b0b1d57e69b1f1bd44e.zip |
Merge tag 'v4.2-rc7' into x86/boot, to refresh the branch before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
-rw-r--r-- | fs/btrfs/dev-replace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 862fbc206755..564a7de17d99 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -378,7 +378,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, ret = btrfs_kobj_add_device(tgt_device->fs_devices, tgt_device); if (ret) - btrfs_error(root->fs_info, ret, "kobj add dev failed"); + btrfs_err(root->fs_info, "kobj add dev failed %d\n", ret); printk_in_rcu(KERN_INFO "BTRFS: dev_replace from %s (devid %llu) to %s started\n", |