Commit 16095af2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

block: cleanup the variable naming in elv_iosched_store

Use eq for the elevator_queue as done elsewhere.  This frees e to be used
for the loop iterator instead of the odd __ prefix.  In addition rename
elv to cur to make it more clear it is the currently selected elevator.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20221030100714.876891-5-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent aae2a643
...@@ -778,9 +778,8 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *buf, ...@@ -778,9 +778,8 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *buf,
ssize_t elv_iosched_show(struct request_queue *q, char *name) ssize_t elv_iosched_show(struct request_queue *q, char *name)
{ {
struct elevator_queue *e = q->elevator; struct elevator_queue *eq = q->elevator;
struct elevator_type *elv = NULL; struct elevator_type *cur = NULL, *e;
struct elevator_type *__e;
int len = 0; int len = 0;
if (!elv_support_iosched(q)) if (!elv_support_iosched(q))
...@@ -789,17 +788,17 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name) ...@@ -789,17 +788,17 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)
if (!q->elevator) if (!q->elevator)
len += sprintf(name+len, "[none] "); len += sprintf(name+len, "[none] ");
else else
elv = e->type; cur = eq->type;
spin_lock(&elv_list_lock); spin_lock(&elv_list_lock);
list_for_each_entry(__e, &elv_list, list) { list_for_each_entry(e, &elv_list, list) {
if (elv && elevator_match(elv, __e->elevator_name, 0)) { if (cur && elevator_match(cur, e->elevator_name, 0)) {
len += sprintf(name+len, "[%s] ", elv->elevator_name); len += sprintf(name+len, "[%s] ", cur->elevator_name);
continue; continue;
} }
if (elevator_match(__e, __e->elevator_name, if (elevator_match(e, e->elevator_name,
q->required_elevator_features)) q->required_elevator_features))
len += sprintf(name+len, "%s ", __e->elevator_name); len += sprintf(name+len, "%s ", e->elevator_name);
} }
spin_unlock(&elv_list_lock); spin_unlock(&elv_list_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment