Message ID | 20200527180644.514302-5-hch@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/8] blk-mq: remove the bio argument to ->prepare_request | expand |
Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
On 5/27/20 8:06 PM, Christoph Hellwig wrote: > To prepare for wider use of this constant give it a more applicable name. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > block/blk-mq-tag.c | 4 ++-- > block/blk-mq-tag.h | 4 ++-- > block/blk-mq.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c > index 586c9d6e904ab..c76ba4f90fa09 100644 > --- a/block/blk-mq-tag.c > +++ b/block/blk-mq-tag.c > @@ -111,7 +111,7 @@ unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data) > if (data->flags & BLK_MQ_REQ_RESERVED) { > if (unlikely(!tags->nr_reserved_tags)) { > WARN_ON_ONCE(1); > - return BLK_MQ_TAG_FAIL; > + return BLK_MQ_NO_TAG; > } > bt = &tags->breserved_tags; > tag_offset = 0; > @@ -125,7 +125,7 @@ unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data) > goto found_tag; > > if (data->flags & BLK_MQ_REQ_NOWAIT) > - return BLK_MQ_TAG_FAIL; > + return BLK_MQ_NO_TAG; > > ws = bt_wait_ptr(bt, data->hctx); > do { > diff --git a/block/blk-mq-tag.h b/block/blk-mq-tag.h > index 2b8321efb6820..8a741752af8b9 100644 > --- a/block/blk-mq-tag.h > +++ b/block/blk-mq-tag.h > @@ -44,9 +44,9 @@ static inline struct sbq_wait_state *bt_wait_ptr(struct sbitmap_queue *bt, > } > > enum { > - BLK_MQ_TAG_FAIL = -1U, > + BLK_MQ_NO_TAG = -1U, > BLK_MQ_TAG_MIN = 1, > - BLK_MQ_TAG_MAX = BLK_MQ_TAG_FAIL - 1, > + BLK_MQ_TAG_MAX = BLK_MQ_NO_TAG - 1, > }; > > extern bool __blk_mq_tag_busy(struct blk_mq_hw_ctx *); > diff --git a/block/blk-mq.c b/block/blk-mq.c > index 1ffbc5d9e7cfe..826ff8f97489c 100644 > --- a/block/blk-mq.c > +++ b/block/blk-mq.c > @@ -386,7 +386,7 @@ static struct request *__blk_mq_alloc_request(struct blk_mq_alloc_data *data) > } > > tag = blk_mq_get_tag(data); > - if (tag == BLK_MQ_TAG_FAIL) { > + if (tag == BLK_MQ_NO_TAG) { > if (clear_ctx_on_error) > data->ctx = NULL; > return NULL; > Hehe. Thanks. Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
On 2020-05-27 11:06, Christoph Hellwig wrote: > To prepare for wider use of this constant give it a more applicable name. Reviewed-by: Bart Van Assche <bvanassche@acm.org>
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 586c9d6e904ab..c76ba4f90fa09 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -111,7 +111,7 @@ unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data) if (data->flags & BLK_MQ_REQ_RESERVED) { if (unlikely(!tags->nr_reserved_tags)) { WARN_ON_ONCE(1); - return BLK_MQ_TAG_FAIL; + return BLK_MQ_NO_TAG; } bt = &tags->breserved_tags; tag_offset = 0; @@ -125,7 +125,7 @@ unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data) goto found_tag; if (data->flags & BLK_MQ_REQ_NOWAIT) - return BLK_MQ_TAG_FAIL; + return BLK_MQ_NO_TAG; ws = bt_wait_ptr(bt, data->hctx); do { diff --git a/block/blk-mq-tag.h b/block/blk-mq-tag.h index 2b8321efb6820..8a741752af8b9 100644 --- a/block/blk-mq-tag.h +++ b/block/blk-mq-tag.h @@ -44,9 +44,9 @@ static inline struct sbq_wait_state *bt_wait_ptr(struct sbitmap_queue *bt, } enum { - BLK_MQ_TAG_FAIL = -1U, + BLK_MQ_NO_TAG = -1U, BLK_MQ_TAG_MIN = 1, - BLK_MQ_TAG_MAX = BLK_MQ_TAG_FAIL - 1, + BLK_MQ_TAG_MAX = BLK_MQ_NO_TAG - 1, }; extern bool __blk_mq_tag_busy(struct blk_mq_hw_ctx *); diff --git a/block/blk-mq.c b/block/blk-mq.c index 1ffbc5d9e7cfe..826ff8f97489c 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -386,7 +386,7 @@ static struct request *__blk_mq_alloc_request(struct blk_mq_alloc_data *data) } tag = blk_mq_get_tag(data); - if (tag == BLK_MQ_TAG_FAIL) { + if (tag == BLK_MQ_NO_TAG) { if (clear_ctx_on_error) data->ctx = NULL; return NULL;
To prepare for wider use of this constant give it a more applicable name. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-mq-tag.c | 4 ++-- block/blk-mq-tag.h | 4 ++-- block/blk-mq.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)