Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-block.git] / block / bsg-lib.c

diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index bcc7dee6abced61e33c55950774cfac418375b09..ee738d129a9f5e18ec43fe24ff02cdfbb89c01df 100644 (file)
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -354,12 +354,14 @@ static const struct blk_mq_ops bsg_mq_ops = {
  * bsg_setup_queue - Create and add the bsg hooks so we can receive requests
  * @dev: device to attach bsg device to
  * @name: device to give bsg device
+ * @lim: queue limits for the bsg queue
  * @job_fn: bsg job handler
  * @timeout: timeout handler function pointer
  * @dd_job_size: size of LLD data needed for each job
  */
 struct request_queue *bsg_setup_queue(struct device *dev, const char *name,
-               bsg_job_fn *job_fn, bsg_timeout_fn *timeout, int dd_job_size)
+               struct queue_limits *lim, bsg_job_fn *job_fn,
+               bsg_timeout_fn *timeout, int dd_job_size)
 {
        struct bsg_set *bset;
        struct blk_mq_tag_set *set;
@@ -383,7 +385,7 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name,
        if (blk_mq_alloc_tag_set(set))
                goto out_tag_set;
 
-       q = blk_mq_alloc_queue(set, NULL, NULL);
+       q = blk_mq_alloc_queue(set, lim, NULL);
        if (IS_ERR(q)) {
                ret = PTR_ERR(q);
                goto out_queue;