Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95cf7809 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Jens Axboe
Browse files

aoe: register default groups with device_add_disk() 



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

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarEd L. Cachin <ed.cashin@acm.org>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 33b14f67

drivers/block/aoe/aoe.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/block/aoe/aoeblk.c

+7 −14
Original line number Diff line number Diff line
@@ -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,
@@ -219,17 +224,6 @@ aoedisk_rm_debugfs(struct aoedev *d) 
	d->debugfs = NULL;

}



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)

{
@@ -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);

drivers/block/aoe/aoedev.c

+0 −1
Original line number Diff line number Diff line
@@ -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);