Re: [PATCH 3/4] blk-mq: move request structures into struct blk_mq_tags

[Jens Axboe <axboe@fb.com>]

On 03/31/2014 08:46 AM, Christoph Hellwig wrote:
> diff --git a/block/blk-mq.h b/block/blk-mq.h
> index 238379a..eca3a47 100644
> --- a/block/blk-mq.h
> +++ b/block/blk-mq.h
> @@ -1,6 +1,24 @@
>   #ifndef INT_BLK_MQ_H
>   #define INT_BLK_MQ_H
>
> +#include <linux/percpu_ida.h>
> +
> +/*
> + * Tag address space map.
> + */
> +struct blk_mq_tags {
> +	unsigned int nr_tags;
> +	unsigned int nr_reserved_tags;
> +	unsigned int nr_batch_move;
> +	unsigned int nr_max_cache;
> +
> +	struct percpu_ida free_tags;
> +	struct percpu_ida reserved_tags;
> +
> +	struct request **rqs;
> +	struct list_head page_list;
> +};
> +

This should go into block/blk-mq-tag.h.


> -static inline struct request *blk_mq_tag_to_rq(struct blk_mq_hw_ctx *hctx,
> -					       unsigned int tag)
> -{
> -	return hctx->rqs[tag];
> -}

We might as well leave this, the mtip32xx conversion ends up using it. 
So if we pull it now, it'll just be reintroduced shortly.

-- 
Jens Axboe