Skip to content

Commit 0546858

Browse files
Yufen Yuaxboe
authored andcommitted
block: get rid of unnecessary local variable
Since whole elevator register is protectd by sysfs_lock, we don't need extras 'has_elevator'. Just use q->elevator directly. Signed-off-by: Yufen Yu <yuyufen@huawei.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent f0c6ae0 commit 0546858

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

block/blk-sysfs.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,6 @@ int blk_register_queue(struct gendisk *disk)
833833
int ret;
834834
struct device *dev = disk_to_dev(disk);
835835
struct request_queue *q = disk->queue;
836-
bool has_elevator = false;
837836

838837
if (WARN_ON(!q))
839838
return -ENXIO;
@@ -899,7 +898,6 @@ int blk_register_queue(struct gendisk *disk)
899898
kobject_put(&dev->kobj);
900899
return ret;
901900
}
902-
has_elevator = true;
903901
}
904902

905903
blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q);
@@ -908,7 +906,7 @@ int blk_register_queue(struct gendisk *disk)
908906

909907
/* Now everything is ready and send out KOBJ_ADD uevent */
910908
kobject_uevent(&q->kobj, KOBJ_ADD);
911-
if (has_elevator)
909+
if (q->elevator)
912910
kobject_uevent(&q->elevator->kobj, KOBJ_ADD);
913911
mutex_unlock(&q->sysfs_lock);
914912

0 commit comments

Comments
 (0)