diff options
| author | Jens Axboe <axboe@fb.com> | 2014-05-30 08:11:50 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-05-30 08:11:50 -0600 |
| commit | f89ca166460e84620db73d4542f28d34c40a8917 (patch) | |
| tree | 6f7ef4b566879674d3dfc6e79b71561a49ac877e /drivers | |
| parent | 879466e6a53ce063fa779476cf648abafcd703a9 (diff) | |
| parent | 2230237500821aedfcf2bba2a79d9cbca389233c (diff) | |
| download | linux-f89ca166460e84620db73d4542f28d34c40a8917.tar.bz2 | |
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 <axboe@fb.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/mtip32xx/mtip32xx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index 74abd49fabdc..abc858b3528b 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -193,9 +193,7 @@ static void mtip_put_int_command(struct driver_data *dd, struct mtip_cmd *cmd) 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, |