From a2c4e95cfdf60e8350884ff77a0df00d5ecdd275 Mon Sep 17 00:00:00 2001 From: Ameer Hamza Date: Tue, 20 Aug 2024 18:45:26 +0500 Subject: [PATCH] linux/zvol_os.c: cleanup limits for non-blk mq case Rob Noris suggested that we could clean up redundant limits for the case of non-blk mq scenario. Reviewed-by: Brian Behlendorf Reviewed-by: Tony Hutter Reviewed-by: Rob Norris Signed-off-by: Ameer Hamza Closes #16462 --- module/os/linux/zfs/zvol_os.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c index 1ac079cc68..d1e3061b50 100644 --- a/module/os/linux/zfs/zvol_os.c +++ b/module/os/linux/zfs/zvol_os.c @@ -1252,7 +1252,6 @@ zvol_alloc_non_blk_mq(struct zvol_state_os *zso, zvol_queue_limits_t *limits) zso->zvo_disk->minors = ZVOL_MINORS; zso->zvo_queue = zso->zvo_disk->queue; - zvol_queue_limits_apply(limits, zso->zvo_queue); #elif defined(HAVE_BLK_ALLOC_DISK_2ARG) struct queue_limits qlimits; zvol_queue_limits_convert(limits, &qlimits); @@ -1266,10 +1265,6 @@ zvol_alloc_non_blk_mq(struct zvol_state_os *zso, zvol_queue_limits_t *limits) zso->zvo_disk->minors = ZVOL_MINORS; zso->zvo_queue = zso->zvo_disk->queue; -#ifndef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES - blk_queue_set_write_cache(zso->zvo_queue, B_TRUE); -#endif - #else zso->zvo_queue = blk_alloc_queue(NUMA_NO_NODE); if (zso->zvo_queue == NULL)