projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: phy: dp83848: add dp83822 PHY support
[cascardo/linux.git]
/
block
/
blk-flush.c
diff --git
a/block/blk-flush.c
b/block/blk-flush.c
index
d308def
..
6a14b68
100644
(file)
--- a/
block/blk-flush.c
+++ b/
block/blk-flush.c
@@
-232,7
+232,7
@@
static void flush_end_io(struct request *flush_rq, int error)
/* release the tag's ownership to the req cloned from */
spin_lock_irqsave(&fq->mq_flush_lock, flags);
/* release the tag's ownership to the req cloned from */
spin_lock_irqsave(&fq->mq_flush_lock, flags);
- hctx =
q->mq_ops->
map_queue(q, flush_rq->mq_ctx->cpu);
+ hctx =
blk_mq_
map_queue(q, flush_rq->mq_ctx->cpu);
blk_mq_tag_set_rq(hctx, flush_rq->tag, fq->orig_rq);
flush_rq->tag = -1;
}
blk_mq_tag_set_rq(hctx, flush_rq->tag, fq->orig_rq);
flush_rq->tag = -1;
}
@@
-325,7
+325,7
@@
static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq)
flush_rq->tag = first_rq->tag;
fq->orig_rq = first_rq;
flush_rq->tag = first_rq->tag;
fq->orig_rq = first_rq;
- hctx =
q->mq_ops->
map_queue(q, first_rq->mq_ctx->cpu);
+ hctx =
blk_mq_
map_queue(q, first_rq->mq_ctx->cpu);
blk_mq_tag_set_rq(hctx, first_rq->tag, flush_rq);
}
blk_mq_tag_set_rq(hctx, first_rq->tag, flush_rq);
}
@@
-358,7
+358,7
@@
static void mq_flush_data_end_io(struct request *rq, int error)
unsigned long flags;
struct blk_flush_queue *fq = blk_get_flush_queue(q, ctx);
unsigned long flags;
struct blk_flush_queue *fq = blk_get_flush_queue(q, ctx);
- hctx =
q->mq_ops->
map_queue(q, ctx->cpu);
+ hctx =
blk_mq_
map_queue(q, ctx->cpu);
/*
* After populating an empty queue, kick it to avoid stall. Read
/*
* After populating an empty queue, kick it to avoid stall. Read