From: Jens Axboe Date: Fri, 30 May 2014 14:11:50 +0000 (-0600) Subject: Merge branch 'for-3.16/core' into for-3.16/drivers X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f89ca166460e84620db73d4542f28d34c40a8917;p=linux-beck.git Merge branch 'for-3.16/core' into for-3.16/drivers Pulled in for the blk_mq_tag_to_rq() change, which impacts mtip32xx. Signed-off-by: Jens Axboe --- f89ca166460e84620db73d4542f28d34c40a8917 diff --cc drivers/block/mtip32xx/mtip32xx.c index 74abd49fabdc,59c5abe32f06..abc858b3528b --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@@ -188,22 -214,19 +188,20 @@@ static void mtip_put_int_command(struc } /* - * Release a command slot. - * - * @port Pointer to the port data structure. - * @tag Tag of command to release - * - * return value - * None + * Once we add support for one hctx per mtip group, this will change a bit */ -static inline void release_slot(struct mtip_port *port, int tag) +static struct request *mtip_rq_from_tag(struct driver_data *dd, + unsigned int tag) +{ - struct blk_mq_hw_ctx *hctx = dd->queue->queue_hw_ctx[0]; - - return blk_mq_tag_to_rq(hctx->tags, tag); ++ return blk_mq_tag_to_rq(dd->queue->queue_hw_ctx[0], tag); +} + +static struct mtip_cmd *mtip_cmd_from_tag(struct driver_data *dd, + unsigned int tag) { - smp_mb__before_clear_bit(); - clear_bit(tag, port->allocated); - smp_mb__after_clear_bit(); + struct request *rq = mtip_rq_from_tag(dd, tag); + + return blk_mq_rq_to_pdu(rq); } /*