lkml.org 
[lkml]   [2021]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 13/39] aoe: register default groups with device_add_disk()
    Date
    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    From: Hannes Reinecke <hare@suse.de>

    commit 95cf7809bf9169fec4e4b7bb24b8069d8f354f96 upstream.

    Register default sysfs groups during device_add_disk() to avoid a
    race condition with udev during startup.

    Signed-off-by: Hannes Reinecke <hare@suse.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Acked-by: Ed L. Cachin <ed.cashin@acm.org>
    Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/block/aoe/aoe.h | 1 -
    drivers/block/aoe/aoeblk.c | 21 +++++++--------------
    drivers/block/aoe/aoedev.c | 1 -
    3 files changed, 7 insertions(+), 16 deletions(-)

    --- a/drivers/block/aoe/aoe.h
    +++ b/drivers/block/aoe/aoe.h
    @@ -201,7 +201,6 @@ int aoeblk_init(void);
    void aoeblk_exit(void);
    void aoeblk_gdalloc(void *);
    void aoedisk_rm_debugfs(struct aoedev *d);
    -void aoedisk_rm_sysfs(struct aoedev *d);

    int aoechr_init(void);
    void aoechr_exit(void);
    --- a/drivers/block/aoe/aoeblk.c
    +++ b/drivers/block/aoe/aoeblk.c
    @@ -177,10 +177,15 @@ static struct attribute *aoe_attrs[] = {
    NULL,
    };

    -static const struct attribute_group attr_group = {
    +static const struct attribute_group aoe_attr_group = {
    .attrs = aoe_attrs,
    };

    +static const struct attribute_group *aoe_attr_groups[] = {
    + &aoe_attr_group,
    + NULL,
    +};
    +
    static const struct file_operations aoe_debugfs_fops = {
    .open = aoe_debugfs_open,
    .read = seq_read,
    @@ -220,17 +225,6 @@ aoedisk_rm_debugfs(struct aoedev *d)
    }

    static int
    -aoedisk_add_sysfs(struct aoedev *d)
    -{
    - return sysfs_create_group(&disk_to_dev(d->gd)->kobj, &attr_group);
    -}
    -void
    -aoedisk_rm_sysfs(struct aoedev *d)
    -{
    - sysfs_remove_group(&disk_to_dev(d->gd)->kobj, &attr_group);
    -}
    -
    -static int
    aoeblk_open(struct block_device *bdev, fmode_t mode)
    {
    struct aoedev *d = bdev->bd_disk->private_data;
    @@ -417,8 +411,7 @@ aoeblk_gdalloc(void *vp)

    spin_unlock_irqrestore(&d->lock, flags);

    - add_disk(gd);
    - aoedisk_add_sysfs(d);
    + device_add_disk(NULL, gd, aoe_attr_groups);
    aoedisk_add_debugfs(d);

    spin_lock_irqsave(&d->lock, flags);
    --- a/drivers/block/aoe/aoedev.c
    +++ b/drivers/block/aoe/aoedev.c
    @@ -275,7 +275,6 @@ freedev(struct aoedev *d)
    del_timer_sync(&d->timer);
    if (d->gd) {
    aoedisk_rm_debugfs(d);
    - aoedisk_rm_sysfs(d);
    del_gendisk(d->gd);
    put_disk(d->gd);
    blk_cleanup_queue(d->blkq);

    \
     
     \ /
      Last update: 2021-03-10 14:30    [W:3.807 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site