block: remove elevator queue's type check in elv_attr_show/store()
authorMing Lei <ming.lei@redhat.com>
Mon, 5 May 2025 14:17:56 +0000 (22:17 +0800)
committerJens Axboe <axboe@kernel.dk>
Tue, 6 May 2025 13:43:43 +0000 (07:43 -0600)
elevatore queue's type is assigned since its allocation, and never
get cleared until it is released.

So its ->type is always not NULL, remove the unnecessary check.

Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Nilay Shroff <nilay@linux.ibm.com>
Suggested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250505141805.2751237-19-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/elevator.c

index eb7140a678d5d0e87a5cb060a268b451a52dc60b..fa436417da3b40d04145608c8278608c244c5d02 100644 (file)
@@ -425,7 +425,7 @@ elv_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
 
        e = container_of(kobj, struct elevator_queue, kobj);
        mutex_lock(&e->sysfs_lock);
-       error = e->type ? entry->show(e, page) : -ENOENT;
+       error = entry->show(e, page);
        mutex_unlock(&e->sysfs_lock);
        return error;
 }
@@ -443,7 +443,7 @@ elv_attr_store(struct kobject *kobj, struct attribute *attr,
 
        e = container_of(kobj, struct elevator_queue, kobj);
        mutex_lock(&e->sysfs_lock);
-       error = e->type ? entry->store(e, page, length) : -ENOENT;
+       error = entry->store(e, page, length);
        mutex_unlock(&e->sysfs_lock);
        return error;
 }