summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-11-17 10:43:05 -0700
committerJens Axboe <axboe@fb.com>2014-11-17 10:43:05 -0700
commit8d76d1015d86f2b66c872fbcaf46072228d757a5 (patch)
treeb9ee1be27323095734ee876c2b1481f0f2d44540 /include/linux
parente805b983d3fc852b80e30327e42c8c5f0c55c62c (diff)
parent7c7f2f2bc9a63f9605a16eabac59fc655dfe7c9a (diff)
Merge branch 'for-3.19/core' into for-3.19/drivers
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/blk-mq.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index c3b64ec5321e..fb0a4fb3dc2b 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -169,6 +169,7 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule);
void blk_mq_insert_request(struct request *, bool, bool, bool);
void blk_mq_run_queues(struct request_queue *q, bool async);
void blk_mq_free_request(struct request *rq);
+void blk_mq_free_hctx_request(struct blk_mq_hw_ctx *, struct request *rq);
bool blk_mq_can_queue(struct blk_mq_hw_ctx *);
struct request *blk_mq_alloc_request(struct request_queue *q, int rw,
gfp_t gfp, bool reserved);