From 4326ab53b7142e474c75b46da2361d148a2f7ce8 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Fri, 1 Feb 2019 13:10:40 -0700 Subject: [PATCH] LU-11913 utils: allow "mq-deadline" as scheduler Allow the "mq-deadline" scheduler for multi-queue block devices, in addition to just "noop" and "deadline". Explicitly add "deadline" as a valid option, in case the default scheduler is changed. Test-Parameters: trivial Signed-off-by: Andreas Dilger Change-Id: I2cb0878188aea43f88c503ea70a699be083ebbe5 Reviewed-on: https://review.whamcloud.com/34163 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Alex Zhuravlev Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre/utils/libmount_utils_ldiskfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lustre/utils/libmount_utils_ldiskfs.c b/lustre/utils/libmount_utils_ldiskfs.c index b40b7da..6807305 100644 --- a/lustre/utils/libmount_utils_ldiskfs.c +++ b/lustre/utils/libmount_utils_ldiskfs.c @@ -1209,7 +1209,9 @@ static int tune_block_dev_scheduler(const char *sys_path, const char *new_sched) *e = '\0'; if (strcmp(old_sched, "noop") == 0 || - strcmp(old_sched, new_sched) == 0) + strcmp(old_sched, "deadline") == 0 || + strcmp(old_sched, "mq-deadline") == 0 || + strstr(old_sched, new_sched) == 0) return 0; rc = write_file(path, new_sched); -- 1.8.3.1