From: Chris Mason Date: Mon, 12 Oct 2015 23:24:15 +0000 (-0700) Subject: Merge branch 'anand/sysfs-updates-v4.3-rc3' of git://git.kernel.org/pub/scm/linux... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=62fb50ab7c903357c92cef2f7677235b92ac575f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'anand/sysfs-updates-v4.3-rc3' of git://git./linux/kernel/git/kdave/linux into for-linus-4.4 Signed-off-by: Chris Mason --- 62fb50ab7c903357c92cef2f7677235b92ac575f diff --cc fs/btrfs/dev-replace.c index ede1c1ad0baf,0978e52ffa42..a64ca942b63f --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@@ -375,12 -375,8 +375,8 @@@ int btrfs_dev_replace_start(struct btrf WARN_ON(!tgt_device); dev_replace->tgtdev = tgt_device; - ret = btrfs_kobj_add_device(tgt_device->fs_devices, tgt_device); - if (ret) - 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", + btrfs_info_in_rcu(root->fs_info, + "dev_replace from %s (devid %llu) to %s started", src_device->missing ? "" : rcu_str_deref(src_device->name), src_device->devid, diff --cc fs/btrfs/volumes.c index 7ad310cc3efb,5688b7821b3d..dd644d767782 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@@ -2350,10 -2320,9 +2320,10 @@@ int btrfs_init_new_device(struct btrfs_ */ snprintf(fsid_buf, BTRFS_UUID_UNPARSED_SIZE, "%pU", root->fs_info->fsid); - if (kobject_rename(&root->fs_info->fs_devices->super_kobj, + if (kobject_rename(&root->fs_info->fs_devices->fsid_kobj, fsid_buf)) - pr_warn("BTRFS: sysfs: failed to create fsid for sprout\n"); + btrfs_warn(root->fs_info, + "sysfs: failed to create fsid for sprout"); } root->fs_info->num_tolerated_disk_barrier_failures =