| Message ID | 20181114160219.28328-8-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/16] block: remove QUEUE_FLAG_BYPASS and ->bypass | expand |
On 11/14/18 5:02 PM, Christoph Hellwig wrote: > Only the mq locking is left in the flush state machine. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > block/blk-flush.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/block/blk-flush.c b/block/blk-flush.c > index c53197dcdd70..fcd18b158fd6 100644 > --- a/block/blk-flush.c > +++ b/block/blk-flush.c > @@ -148,7 +148,7 @@ static void blk_flush_queue_rq(struct request *rq, bool add_front) > * completion and trigger the next step. > * > * CONTEXT: > - * spin_lock_irq(q->queue_lock or fq->mq_flush_lock) > + * spin_lock_irq(fq->mq_flush_lock) > * > * RETURNS: > * %true if requests were added to the dispatch queue, %false otherwise. > @@ -252,7 +252,7 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error) > * Please read the comment at the top of this file for more info. > * > * CONTEXT: > - * spin_lock_irq(q->queue_lock or fq->mq_flush_lock) > + * spin_lock_irq(fq->mq_flush_lock) > * > */ > static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq, > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
diff --git a/block/blk-flush.c b/block/blk-flush.c index c53197dcdd70..fcd18b158fd6 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -148,7 +148,7 @@ static void blk_flush_queue_rq(struct request *rq, bool add_front) * completion and trigger the next step. * * CONTEXT: - * spin_lock_irq(q->queue_lock or fq->mq_flush_lock) + * spin_lock_irq(fq->mq_flush_lock) * * RETURNS: * %true if requests were added to the dispatch queue, %false otherwise. @@ -252,7 +252,7 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error) * Please read the comment at the top of this file for more info. * * CONTEXT: - * spin_lock_irq(q->queue_lock or fq->mq_flush_lock) + * spin_lock_irq(fq->mq_flush_lock) * */ static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq,
Only the mq locking is left in the flush state machine. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-flush.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)