Commit 7919d679 authored by Jinlong Chen's avatar Jinlong Chen Committed by Jens Axboe
Browse files

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: default avatarJinlong Chen <nickyc975@zju.edu.cn>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/bdd7083ed4f232e3285f39081e3c5f30b20b8da2.1669736350.git.nickyc975@zju.edu.cn


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8613dec0

block/elevator.c

+4 −5
Original line number Diff line number Diff line
@@ -767,10 +767,12 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name) 
	if (!elv_support_iosched(q))

		return sprintf(name, "none\n");



	if (!q->elevator)

	if (!q->elevator) {

		len += sprintf(name+len, "[none] ");

	else

	} else {

		len += sprintf(name+len, "none ");

		cur = eq->type;

	}



	spin_lock(&elv_list_lock);

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



	if (q->elevator)

		len += sprintf(name+len, "none");



	len += sprintf(len+name, "\n");

	return len;

}