Merge branch 'for-3.16/core' into for-3.16/drivers

mtip32xx uses blk_mq_alloc_reserved_request(), so pull in the
core changes so we have a properly merged end result.

Signed-off-by: Jens Axboe <axboe@fb.com>

3 files changed, 6 insertions, 35 deletions

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index ae331ab4a451..ea323e91903b 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -178,7 +178,7 @@ static struct mtip_cmd *mtip_get_int_command(struct driver_data *dd)
 {
         struct request *rq;
 
-        rq = blk_mq_alloc_reserved_request(dd->queue, 0, __GFP_WAIT);
+        rq = blk_mq_alloc_request(dd->queue, 0, __GFP_WAIT, true);
         return blk_mq_rq_to_pdu(rq);
 }
 
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index e932398588aa..5a8081114df6 100644
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -322,39 +322,10 @@ static int null_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *rq)
 }
 
 static struct blk_mq_hw_ctx *null_alloc_hctx(struct blk_mq_tag_set *set,
-                unsigned int hctx_index)
+                                             unsigned int hctx_index,
+                                             int node)
 {
-        int b_size = DIV_ROUND_UP(set->nr_hw_queues, nr_online_nodes);
-        int tip = (set->nr_hw_queues % nr_online_nodes);
-        int node = 0, i, n;
-
-        /*
-         * Split submit queues evenly wrt to the number of nodes. If uneven,
-         * fill the first buckets with one extra, until the rest is filled with
-         * no extra.
-         */
-        for (i = 0, n = 1; i < hctx_index; i++, n++) {
-                if (n % b_size == 0) {
-                        n = 0;
-                        node++;
-
-                        tip--;
-                        if (!tip)
-                                b_size = set->nr_hw_queues / nr_online_nodes;
-                }
-        }
-
-        /*
-         * A node might not be online, therefore map the relative node id to the
-         * real node id.
-         */
-        for_each_online_node(n) {
-                if (!node)
-                        break;
-                node--;
-        }
-
-        return kzalloc_node(sizeof(struct blk_mq_hw_ctx), GFP_KERNEL, n);
+        return kzalloc_node(sizeof(struct blk_mq_hw_ctx), GFP_KERNEL, node);
 }
 
 static void null_free_hctx(struct blk_mq_hw_ctx *hctx, unsigned int hctx_index)
diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index 1dcf9067cffa..608532d3f8c9 100644
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -743,6 +743,7 @@ static void skd_request_fn(struct request_queue *q)
                                 break;
                         }
                         skreq->discard_page = 1;
+                        req->completion_data = page;
                         skd_prep_discard_cdb(scsi_req, skreq, page, lba, count);
 
                 } else if (flush == SKD_FLUSH_ZERO_SIZE_FIRST) {
@@ -855,10 +856,9 @@ static void skd_end_request(struct skd_device *skdev,
 
         if ((io_flags & REQ_DISCARD) &&
                 (skreq->discard_page == 1)) {
-                struct bio *bio = req->bio;
                 pr_debug("%s:%s:%d, free the page!",
                          skdev->name, __func__, __LINE__);
-                __free_page(bio->bi_io_vec->bv_page);
+                __free_page(req->completion_data);
         }
 
         if (unlikely(error)) {