]> git.proxmox.com Git - mirror_zfs.git/commitdiff
zvol_os: fix build on Linux <3.13
authorRob N <rob.norris@klarasystems.com>
Mon, 8 Apr 2024 17:13:27 +0000 (03:13 +1000)
committerGitHub <noreply@github.com>
Mon, 8 Apr 2024 17:13:27 +0000 (10:13 -0700)
99741bde5 introduced zvol_num_taskqs, but put it behind the HAVE_BLK_MQ
define, preventing builds on versions of Linux that don't have it
(<3.13, incl EL7).

Nothing about it seems dependent on blk-mq, so this just moves it out
from behind that define and so fixes the build.

Sponsored-by: Klara, Inc.
Sponsored-by: Wasabi Technology, Inc.
Reviewed-by: Ameer Hamza <ahamza@ixsystems.com>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
Closes #16062

module/os/linux/zfs/zvol_os.c

index 10777693249340505b7ee9d027431d58a3fb2c19..e2a6ba3a7f32e2b5329c1f044ab2e3b54220f581 100644 (file)
@@ -81,9 +81,10 @@ static boolean_t zvol_use_blk_mq = B_FALSE;
  * read and write tests to a zvol in an NVMe pool (with 16 CPUs).
  */
 static unsigned int zvol_blk_mq_blocks_per_thread = 8;
-static unsigned int zvol_num_taskqs = 0;
 #endif
 
+static unsigned int zvol_num_taskqs = 0;
+
 #ifndef        BLKDEV_DEFAULT_RQ
 /* BLKDEV_MAX_RQ was renamed to BLKDEV_DEFAULT_RQ in the 5.16 kernel */
 #define        BLKDEV_DEFAULT_RQ BLKDEV_MAX_RQ