Linux compat 4.16: blk_queue_flag_{set,clear}

queue_flag_{set,clear}_unlocked are now private interfaces in
the Linux kernel (https://github.com/torvalds/linux/commit/8a0ac14).
Use blk_queue_flag_{set,clear} interfaces which were introduced as
of https://github.com/torvalds/linux/commit/8814ce8.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Closes #7410

diff --git a/config/kernel-blk-queue-flags.m4 b/config/kernel-blk-queue-flags.m4
new file mode 100644 (file)
index 0000000..b570245
--- /dev/null
+++ b/config/kernel-blk-queue-flags.m4
@@ -0,0 +1,38 @@
+dnl #
+dnl # API change
+dnl # https://github.com/torvalds/linux/commit/8814ce8
+dnl # Introduction of blk_queue_flag_set and blk_queue_flag_clear
+dnl #
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLAG_SET], [
+       AC_MSG_CHECKING([whether blk_queue_flag_set() exists])
+       ZFS_LINUX_TRY_COMPILE([
+               #include <linux/kernel.h>
+               #include <linux/blkdev.h>
+       ],[
+               struct request_queue *q = NULL;
+               blk_queue_flag_set(0, q);
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_BLK_QUEUE_FLAG_SET, 1, [blk_queue_flag_set() exists])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLAG_CLEAR], [
+       AC_MSG_CHECKING([whether blk_queue_flag_clear() exists])
+       ZFS_LINUX_TRY_COMPILE([
+               #include <linux/kernel.h>
+               #include <linux/blkdev.h>
+       ],[
+               struct request_queue *q = NULL;
+               blk_queue_flag_clear(0, q);
+       ],[
+
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_BLK_QUEUE_FLAG_CLEAR, 1, [blk_queue_flag_clear() exists])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])

diff --git a/config/kernel.m4 b/config/kernel.m4
index 910d4ff25c4480f481efbad6d88370bf86c7a5c0..93158f3d0c533fff173d28e97476afa03b4cbaa6 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -35,6 +35,8 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_BIO_RW_BARRIER
        ZFS_AC_KERNEL_BIO_RW_DISCARD
        ZFS_AC_KERNEL_BLK_QUEUE_BDI
+       ZFS_AC_KERNEL_BLK_QUEUE_FLAG_CLEAR
+       ZFS_AC_KERNEL_BLK_QUEUE_FLAG_SET
        ZFS_AC_KERNEL_BLK_QUEUE_FLUSH
        ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS
        ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS

diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h
index 4406493e4caa11113e8c92fcf1624c9987010bb8..d7af1d89d240f62b3bc4c0ccc7427d672afc8bd7 100644 (file)
--- a/include/linux/blkdev_compat.h
+++ b/include/linux/blkdev_compat.h
@@ -37,6 +37,22 @@
 typedef unsigned __bitwise__ fmode_t;
 #endif /* HAVE_FMODE_T */
 
+#ifndef HAVE_BLK_QUEUE_FLAG_SET
+static inline void
+blk_queue_flag_set(unsigned int flag, struct request_queue *q)
+{
+       queue_flag_set_unlocked(flag, q);
+}
+#endif
+
+#ifndef HAVE_BLK_QUEUE_FLAG_CLEAR
+static inline void
+blk_queue_flag_clear(unsigned int flag, struct request_queue *q)
+{
+       queue_flag_clear_unlocked(flag, q);
+}
+#endif
+
 /*
  * 4.7 - 4.x API,
  * The blk_queue_write_cache() interface has replaced blk_queue_flush()

diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index 62176e1cfbbcb8cee27627c9ce966436537feb88..3e7059b340bbf4f975a4b559899969206950915a 100644 (file)
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -1666,7 +1666,7 @@ zvol_alloc(dev_t dev, const char *name)
        blk_queue_set_read_ahead(zv->zv_queue, 1);
 
        /* Disable write merging in favor of the ZIO pipeline. */
-       queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, zv->zv_queue);
+       blk_queue_flag_set(QUEUE_FLAG_NOMERGES, zv->zv_queue);
 
        zv->zv_disk = alloc_disk(ZVOL_MINORS);
        if (zv->zv_disk == NULL)
@@ -1817,12 +1817,12 @@ zvol_create_minor_impl(const char *name)
        blk_queue_max_discard_sectors(zv->zv_queue,
            (zvol_max_discard_blocks * zv->zv_volblocksize) >> 9);
        blk_queue_discard_granularity(zv->zv_queue, zv->zv_volblocksize);
-       queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, zv->zv_queue);
+       blk_queue_flag_set(QUEUE_FLAG_DISCARD, zv->zv_queue);
 #ifdef QUEUE_FLAG_NONROT
-       queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zv->zv_queue);
+       blk_queue_flag_set(QUEUE_FLAG_NONROT, zv->zv_queue);
 #endif
 #ifdef QUEUE_FLAG_ADD_RANDOM
-       queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, zv->zv_queue);
+       blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, zv->zv_queue);
 #endif
 
        if (spa_writeable(dmu_objset_spa(os))) {