Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2019-09-10 14:10:57 +0200
committerHannes Reinecke <hare@suse.de>2019-09-10 14:10:57 +0200
commit9e76b3d11462bbfdcadcf93460c9700647b73392 (patch)
tree4b029781594018b8b0b901f45ef6b4dec95e3d72
parentaf1b683886b1b1ee500c6fead833328878d30921 (diff)
blk-mq: backport fixes for blk_mq_complete_e_request_sync()
(bsc#1145661). suse-commit: a78db034e899cc3000d01d06c05b83e201521c6d
-rw-r--r--block/blk-mq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 2fa1753707ba..1ea504b789c0 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -590,8 +590,8 @@ EXPORT_SYMBOL(blk_mq_complete_request);
void blk_mq_complete_request_sync(struct request *rq)
{
- WRITE_ONCE(rq->state, MQ_RQ_COMPLETE);
- rq->q->mq_ops->complete(rq);
+ if (!blk_mark_rq_complete(rq))
+ rq->q->mq_ops->complete(rq);
}
EXPORT_SYMBOL_GPL(blk_mq_complete_request_sync);