diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
| commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
| tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /fs/btrfs/dev-replace.c | |
| parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
| parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
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, | |||
| 378 | 378 | ||
| 379 | ret = btrfs_kobj_add_device(tgt_device->fs_devices, tgt_device); | 379 | ret = btrfs_kobj_add_device(tgt_device->fs_devices, tgt_device); |
| 380 | if (ret) | 380 | if (ret) |
| 381 | btrfs_error(root->fs_info, ret, "kobj add dev failed"); | 381 | btrfs_err(root->fs_info, "kobj add dev failed %d\n", ret); |
| 382 | 382 | ||
| 383 | printk_in_rcu(KERN_INFO | 383 | printk_in_rcu(KERN_INFO |
| 384 | "BTRFS: dev_replace from %s (devid %llu) to %s started\n", | 384 | "BTRFS: dev_replace from %s (devid %llu) to %s started\n", |