UBUNTU: SAUCE: hio: pass make_request ptr directly to blk_alloc_queue()

Commit "3d745ea block: simplify queue allocation" merged queue
allocation and callback setup in blk_alloc_queue(), fix the code
accordingly.

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/ubuntu/hio/hio.c b/ubuntu/hio/hio.c
index 276c2410e04678210535de80cbc4b46a474d4da5..fb471d95b92ab8b299851ade5cca3c1c3037e96a 100644 (file)
--- a/ubuntu/hio/hio.c
+++ b/ubuntu/hio/hio.c
@@ -10407,6 +10407,7 @@ static void ssd_cleanup_queue(struct ssd_device *dev)
 
 static int ssd_init_queue(struct ssd_device *dev)
 {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,7,0))
        dev->rq = blk_alloc_queue(GFP_KERNEL);
        if (dev->rq == NULL) {
                hio_warn("%s: alloc queue: failed\n ", dev->name);
@@ -10415,7 +10416,13 @@ static int ssd_init_queue(struct ssd_device *dev)
 
        /* must be first */
        blk_queue_make_request(dev->rq, ssd_make_request);
-
+#else
+       dev->rq = blk_alloc_queue(ssd_make_request, NUMA_NO_NODE);
+       if (dev->rq == NULL) {
+               hio_warn("%s: blk_alloc_queue(): failed\n ", dev->name);
+               goto out_init_queue;
+       }
+#endif
 #if ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)) && !(defined RHEL_MAJOR && RHEL_MAJOR == 6))
        blk_queue_max_hw_segments(dev->rq, dev->hw_info.cmd_max_sg);
        blk_queue_max_phys_segments(dev->rq, dev->hw_info.cmd_max_sg);