From: Nikolay Borisov <nborisov@suse.com>
To: Anand Jain <anand.jain@oracle.com>, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 02/15] btrfs: add btrfs_sysfs_remove_device helper
Date: Thu, 3 Sep 2020 13:09:02 +0300 [thread overview]
Message-ID: <8f014715-ff3b-57d4-a45d-b3544aa07edb@suse.com> (raw)
In-Reply-To: <cbd33e03-87d7-ea17-8141-33b0ee8bf06b@oracle.com>
On 3.09.20 г. 13:03 ч., Anand Jain wrote:
>
>
> On 3/9/20 4:44 pm, Nikolay Borisov wrote:
>>
>>
>> On 3.09.20 г. 3:57 ч., Anand Jain wrote:
>>> btrfs_sysfs_remove_devices_dir() removes device link and devid kobject
>>> (sysfs entries) for a device or all the devices in the btrfs_fs_devices.
>>> In preparation to remove these sysfs entries for the seed as well, add
>>> a btrfs_sysfs_remove_device() helper function and avoid code
>>> duplication.
>>>
>>> Signed-off-by: Anand Jain <anand.jain@oracle.com>
>>
>> LGTM, one nit below though:
>>
>> Reviewed-by: Nikolay Borisov <nborisov@suse.com>
>>
>>> ---
>>> fs/btrfs/sysfs.c | 54 ++++++++++++++++++++++--------------------------
>>> 1 file changed, 25 insertions(+), 29 deletions(-)
>>>
>>> diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
>>> index 3381a91d7deb..241ec0ad0379 100644
>>> --- a/fs/btrfs/sysfs.c
>>> +++ b/fs/btrfs/sysfs.c
>>> @@ -1149,46 +1149,42 @@ int btrfs_sysfs_add_space_info_type(struct
>>> btrfs_fs_info *fs_info,
>>> return 0;
>>> }
>>> -/* when one_device is NULL, it removes all device links */
>>> -
>>> -int btrfs_sysfs_remove_devices_dir(struct btrfs_fs_devices *fs_devices,
>>> - struct btrfs_device *one_device)
>>> +static void btrfs_sysfs_remove_device(struct btrfs_device *device)
>>> {
>>> struct hd_struct *disk;
>>> struct kobject *disk_kobj;
>>> + struct kobject *devices_kobj;
>>> - if (!fs_devices->devices_kobj)
>>> - return -EINVAL;
>>> + /*
>>> + * Seed fs_devices devices_kobj aren't used, fetch kobject from the
>>> + * fs_info::fs_devices.
>>> + */
>>> + devices_kobj = device->fs_info->fs_devices->devices_kobj;
>>
>> nit: device->fs_info->fs_devices
>
> Sorry what are you suggesting here? I didn't understand.
Ah, nothing, you already done it the way I suggested.
>
> Thanks, Anand
>
>
>
>>
>>> + ASSERT(devices_kobj);
>>> - if (one_device) {
>>> - if (one_device->bdev) {
>>> - disk = one_device->bdev->bd_part;
>>> - disk_kobj = &part_to_dev(disk)->kobj;
>>> - sysfs_remove_link(fs_devices->devices_kobj,
>>> - disk_kobj->name);
>>> - }
>>> + if (device->bdev) {
>>> + disk = device->bdev->bd_part;
>>> + disk_kobj = &part_to_dev(disk)->kobj;
>>> + sysfs_remove_link(devices_kobj, disk_kobj->name);
>>> + }
>>> - kobject_del(&one_device->devid_kobj);
>>> - kobject_put(&one_device->devid_kobj);
>>> + kobject_del(&device->devid_kobj);
>>> + kobject_put(&device->devid_kobj);
>>> - wait_for_completion(&one_device->kobj_unregister);
>>> + wait_for_completion(&device->kobj_unregister);
>>> +}
>>> +/* when 2nd argument device is NULL, it removes all devices link */
>>> +int btrfs_sysfs_remove_devices_dir(struct btrfs_fs_devices *fs_devices,
>>> + struct btrfs_device *one_device)
>>> +{
>>> + if (one_device) {
>>> + btrfs_sysfs_remove_device(one_device);
>>> return 0;
>>> }
>>> - list_for_each_entry(one_device, &fs_devices->devices, dev_list) {
>>> -
>>> - if (one_device->bdev) {
>>> - disk = one_device->bdev->bd_part;
>>> - disk_kobj = &part_to_dev(disk)->kobj;
>>> - sysfs_remove_link(fs_devices->devices_kobj,
>>> - disk_kobj->name);
>>> - }
>>> - kobject_del(&one_device->devid_kobj);
>>> - kobject_put(&one_device->devid_kobj);
>>> -
>>> - wait_for_completion(&one_device->kobj_unregister);
>>> - }
>>> + list_for_each_entry(one_device, &fs_devices->devices, dev_list)
>>> + btrfs_sysfs_remove_device(one_device);
>>> return 0;
>>> }
>>>
>
next prev parent reply other threads:[~2020-09-03 10:09 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 0:57 [PATCH v2 0/15] btrfs: seed fix null ptr, use only main device_list_mutex, and cleanups Anand Jain
2020-09-03 0:57 ` [PATCH 01/15] btrfs: add btrfs_sysfs_add_device helper Anand Jain
2020-09-03 8:40 ` Nikolay Borisov
2020-09-03 9:36 ` Anand Jain
2020-09-03 10:14 ` Anand Jain
2020-09-03 0:57 ` [PATCH 02/15] btrfs: add btrfs_sysfs_remove_device helper Anand Jain
2020-09-03 8:44 ` Nikolay Borisov
2020-09-03 10:03 ` Anand Jain
2020-09-03 10:09 ` Nikolay Borisov [this message]
2020-09-03 15:43 ` Josef Bacik
2020-09-03 0:57 ` [PATCH 03/15] btrfs: btrfs_sysfs_remove_devices_dir drop return value Anand Jain
2020-09-03 8:42 ` Nikolay Borisov
2020-09-03 15:44 ` Josef Bacik
2020-09-03 0:57 ` [PATCH 04/15] btrfs: refactor btrfs_sysfs_add_devices_dir Anand Jain
2020-09-03 8:45 ` Nikolay Borisov
2020-09-03 15:44 ` Josef Bacik
2020-09-03 0:57 ` [PATCH 05/15] btrfs: refactor btrfs_sysfs_remove_devices_dir Anand Jain
2020-09-03 8:47 ` Nikolay Borisov
2020-09-03 0:57 ` [PATCH 06/15] btrfs: initialize sysfs devid and device link for seed device Anand Jain
2020-09-03 9:06 ` Nikolay Borisov
2020-09-03 11:35 ` Anand Jain
2020-09-04 11:28 ` David Sterba
2020-09-03 0:57 ` [PATCH 07/15] btrfs: handle fail path for btrfs_sysfs_add_fs_devices Anand Jain
2020-09-03 9:13 ` Nikolay Borisov
2020-09-04 9:24 ` [PATCH v3 " Anand Jain
2020-09-03 0:57 ` [PATCH 08/15] btrfs: reada: use sprout device_list_mutex Anand Jain
2020-09-03 0:57 ` [PATCH 09/15] btrfs: btrfs_init_devices_late: " Anand Jain
2020-09-03 0:57 ` [PATCH 10/15] btrfs: open code list_head pointer in btrfs_init_dev_replace_tgtdev Anand Jain
2020-09-03 0:57 ` [PATCH 11/15] btrfs: cleanup btrfs_remove_chunk Anand Jain
2020-09-03 0:57 ` [PATCH 12/15] btrfs: cleanup btrfs_assign_next_active_device() Anand Jain
2020-09-03 0:57 ` [PATCH 13/15] btrfs: cleanup unnecessary goto in open_seed_device Anand Jain
2020-09-03 0:57 ` [PATCH 14/15] btrfs: btrfs_dev_replace_update_device_in_mapping_tree drop file global declare Anand Jain
2020-09-03 0:57 ` [PATCH 15/15] btrfs: fix replace of seed device Anand Jain
2020-09-03 10:46 ` [PATCH v3 1/15] btrfs: add btrfs_sysfs_add_device helper Anand Jain
2020-09-03 15:42 ` Josef Bacik
2020-09-03 11:35 ` [PATCH] fstests: btrfs/161: extend the test case to delete seed Anand Jain
2020-09-03 15:46 ` Josef Bacik
2020-09-04 9:13 ` [PATCH] btrfs: add a test case for btrfs seed device delete Anand Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8f014715-ff3b-57d4-a45d-b3544aa07edb@suse.com \
--to=nborisov@suse.com \
--cc=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox