git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ixp4xx-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[sfrench/cifs-2.6.git]
/
block
/
blk-flush.c
diff --git
a/block/blk-flush.c
b/block/blk-flush.c
index 6e0f2d97fc6d8f0a5b14e6dbea23f817706bef7a..d95f9489201526081abf8b8bdcc65a525cf4c179 100644
(file)
--- a/
block/blk-flush.c
+++ b/
block/blk-flush.c
@@
-220,7
+220,7
@@
static void flush_end_io(struct request *flush_rq, blk_status_t error)
blk_mq_tag_set_rq(hctx, flush_rq->tag, fq->orig_rq);
flush_rq->tag = -1;
} else {
blk_mq_tag_set_rq(hctx, flush_rq->tag, fq->orig_rq);
flush_rq->tag = -1;
} else {
- blk_mq_put_driver_tag
_hctx(hctx,
flush_rq);
+ blk_mq_put_driver_tag
(
flush_rq);
flush_rq->internal_tag = -1;
}
flush_rq->internal_tag = -1;
}
@@
-324,7
+324,7
@@
static void mq_flush_data_end_io(struct request *rq, blk_status_t error)
if (q->elevator) {
WARN_ON(rq->tag < 0);
if (q->elevator) {
WARN_ON(rq->tag < 0);
- blk_mq_put_driver_tag
_hctx(hctx,
rq);
+ blk_mq_put_driver_tag
(
rq);
}
/*
}
/*