From: Nikolay Borisov <nborisov@suse.com>
To: Anand Jain <anand.jain@oracle.com>, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 07/15] btrfs: handle fail path for btrfs_sysfs_add_fs_devices
Date: Thu, 3 Sep 2020 12:13:37 +0300 [thread overview]
Message-ID: <20ff664e-b1b9-e3ab-f03a-46ab6ffbda50@suse.com> (raw)
In-Reply-To: <32779bc42ae40eea707cc585624724ac91cd967e.1599091832.git.anand.jain@oracle.com>
On 3.09.20 г. 3:57 ч., Anand Jain wrote:
> btrfs_sysfs_add_fs_devices() is called by btrfs_sysfs_add_mounted().
> btrfs_sysfs_add_mounted() assumes that btrfs_sysfs_add_fs_devices() will
> either add sysfs entries for all the devices or none. So this patch keeps up
> to its caller expecatation and cleans up the created sysfs entries if it
> has to fail at some device in the list.
>
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
I though calling sysfs_remove_link for an uninitialized link could be
problematic but it's not - it will simply return -ENOENT. So
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
> ---
> fs/btrfs/sysfs.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
> index 98ce955a0879..a5a73b21d4af 100644
> --- a/fs/btrfs/sysfs.c
> +++ b/fs/btrfs/sysfs.c
> @@ -1182,10 +1182,12 @@ void btrfs_sysfs_remove_device(struct btrfs_device *device)
> sysfs_remove_link(devices_kobj, disk_kobj->name);
> }
>
> - kobject_del(&device->devid_kobj);
> - kobject_put(&device->devid_kobj);
> + if (device->devid_kobj.state_initialized) {
> + kobject_del(&device->devid_kobj);
> + kobject_put(&device->devid_kobj);
> + wait_for_completion(&device->kobj_unregister);
> + }
>
> - wait_for_completion(&device->kobj_unregister);
> }
>
> static ssize_t btrfs_devinfo_in_fs_metadata_show(struct kobject *kobj,
> @@ -1324,19 +1326,21 @@ int btrfs_sysfs_add_fs_devices(struct btrfs_fs_devices *fs_devices)
>
> list_for_each_entry(device, &fs_devices->devices, dev_list) {
> ret = btrfs_sysfs_add_device(device);
> - if (ret)
> - return ret;
> + goto fail;
> }
>
> list_for_each_entry(seed, &fs_devices->seed_list, seed_list) {
> list_for_each_entry(device, &seed->devices, dev_list) {
> ret = btrfs_sysfs_add_device(device);
> - if (ret)
> - return ret;
> + goto fail;
> }
> }
>
> return 0;
> +
> +fail:
> + btrfs_sysfs_remove_fs_devices(fs_devices);
> + return ret;
> }
>
> void btrfs_kobject_uevent(struct block_device *bdev, enum kobject_action action)
>
next prev parent reply other threads:[~2020-09-03 9:13 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
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 [this message]
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=20ff664e-b1b9-e3ab-f03a-46ab6ffbda50@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