On 08/18/2017 01:23 AM, Bart Van Assche wrote: > Since patch "blk-mq: switch .queue_rq return value to blk_status_t" > .queue_rq() returns a BLK_STS_* value instead of a BLK_MQ_RQ_* > value. Hence refer to the former in comments about .queue_rq() > return values. > > Fixes: commit 39a70c76b89b ("blk-mq: clarify dispatch may not be drained/blocked by stopping queue") > Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxx> > Cc: Ming Lei <ming.lei@xxxxxxxxxx> > Cc: Christoph Hellwig <hch@xxxxxx> > Cc: Hannes Reinecke <hare@xxxxxxx> > Cc: Johannes Thumshirn <jthumshirn@xxxxxxx> > --- > block/blk-mq.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/block/blk-mq.c b/block/blk-mq.c > index fe764ca16993..f84d145490bf 100644 > --- a/block/blk-mq.c > +++ b/block/blk-mq.c > @@ -1258,7 +1258,7 @@ EXPORT_SYMBOL(blk_mq_queue_stopped); > /* > * This function is often used for pausing .queue_rq() by driver when > * there isn't enough resource or some conditions aren't satisfied, and > - * BLK_MQ_RQ_QUEUE_BUSY is usually returned. > + * BLK_STS_RESOURCE is usually returned. > * > * We do not guarantee that dispatch can be drained or blocked > * after blk_mq_stop_hw_queue() returns. Please use > @@ -1275,7 +1275,7 @@ EXPORT_SYMBOL(blk_mq_stop_hw_queue); > /* > * This function is often used for pausing .queue_rq() by driver when > * there isn't enough resource or some conditions aren't satisfied, and > - * BLK_MQ_RQ_QUEUE_BUSY is usually returned. > + * BLK_STS_RESOURCE is usually returned. > * > * We do not guarantee that dispatch can be drained or blocked > * after blk_mq_stop_hw_queues() returns. Please use > Reviewed-by: Hannes Reinecke <hare@xxxxxxxx> Cheers, Hannes -- Dr. Hannes Reinecke Teamlead Storage & Networking hare@xxxxxxx +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg)