UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: include 'none' for initial elv_iosched_show call 

This makes the printing order of the io schedulers consistent, and removes
a redundant q->elevator check.

Signed-off-by: Jinlong Chen <nickyc975@zju.edu.cn>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/bdd7083ed4f232e3285f39081e3c5f30b20b8da2.1669736350.git.nickyc975@zju.edu.cn
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jinlong Chen 2022-11-29 23:46:34 +08:00 committed by Jens Axboe
parent 8613dec04e
commit 7919d679ae
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block/elevator.c
View File

@ -767,10 +767,12 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)
if (!elv_support_iosched(q)) if (!elv_support_iosched(q))
return sprintf(name, "none\n"); return sprintf(name, "none\n");
if (!q->elevator) if (!q->elevator) {
len += sprintf(name+len, "[none] "); len += sprintf(name+len, "[none] ");
else } else {
len += sprintf(name+len, "none ");
cur = eq->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) {
@ -783,9 +785,6 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)
} }
spin_unlock(&elv_list_lock); spin_unlock(&elv_list_lock);
if (q->elevator)
len += sprintf(name+len, "none");
len += sprintf(len+name, "\n"); len += sprintf(len+name, "\n");
return len; return len;
} }