diff options
author | Anand Jain <Anand.Jain@oracle.com> | 2014-06-02 23:36:01 -0400 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2014-06-28 16:48:43 -0400 |
commit | 0d39376aa28eba6d63d0120ccc399735842abc8e (patch) | |
tree | d588573634e0af59e6fc330d32ead6d53a18ac2c /fs/btrfs/sysfs.c | |
parent | 99994cde9c59c2b8bb67d46d531b26cc73e39747 (diff) |
btrfs: dev add should add its sysfs entry
we would need the device links to be created,
when device is added.
Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/sysfs.c')
-rw-r--r-- | fs/btrfs/sysfs.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index 401677b11045..78699364f537 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c | |||
@@ -625,14 +625,17 @@ int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info, | |||
625 | return 0; | 625 | return 0; |
626 | } | 626 | } |
627 | 627 | ||
628 | static int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info) | 628 | int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info, |
629 | struct btrfs_device *one_device) | ||
629 | { | 630 | { |
630 | int error = 0; | 631 | int error = 0; |
631 | struct btrfs_fs_devices *fs_devices = fs_info->fs_devices; | 632 | struct btrfs_fs_devices *fs_devices = fs_info->fs_devices; |
632 | struct btrfs_device *dev; | 633 | struct btrfs_device *dev; |
633 | 634 | ||
634 | fs_info->device_dir_kobj = kobject_create_and_add("devices", | 635 | if (!fs_info->device_dir_kobj) |
636 | fs_info->device_dir_kobj = kobject_create_and_add("devices", | ||
635 | &fs_info->super_kobj); | 637 | &fs_info->super_kobj); |
638 | |||
636 | if (!fs_info->device_dir_kobj) | 639 | if (!fs_info->device_dir_kobj) |
637 | return -ENOMEM; | 640 | return -ENOMEM; |
638 | 641 | ||
@@ -643,6 +646,9 @@ static int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info) | |||
643 | if (!dev->bdev) | 646 | if (!dev->bdev) |
644 | continue; | 647 | continue; |
645 | 648 | ||
649 | if (one_device && one_device != dev) | ||
650 | continue; | ||
651 | |||
646 | disk = dev->bdev->bd_part; | 652 | disk = dev->bdev->bd_part; |
647 | disk_kobj = &part_to_dev(disk)->kobj; | 653 | disk_kobj = &part_to_dev(disk)->kobj; |
648 | 654 | ||
@@ -686,7 +692,7 @@ int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info) | |||
686 | if (error) | 692 | if (error) |
687 | goto failure; | 693 | goto failure; |
688 | 694 | ||
689 | error = btrfs_kobj_add_device(fs_info); | 695 | error = btrfs_kobj_add_device(fs_info, NULL); |
690 | if (error) | 696 | if (error) |
691 | goto failure; | 697 | goto failure; |
692 | 698 | ||