projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
selftests/seccomp: More closely track fds being assigned
[linux-2.6-microblaze.git]
/
block
/
blk-mq-sched.c
diff --git
a/block/blk-mq-sched.c
b/block/blk-mq-sched.c
index
42a365b
..
996a4b2
100644
(file)
--- a/
block/blk-mq-sched.c
+++ b/
block/blk-mq-sched.c
@@
-358,14
+358,16
@@
bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio,
unsigned int nr_segs)
{
struct elevator_queue *e = q->elevator;
unsigned int nr_segs)
{
struct elevator_queue *e = q->elevator;
- struct blk_mq_ctx *ctx
= blk_mq_get_ctx(q)
;
- struct blk_mq_hw_ctx *hctx
= blk_mq_map_queue(q, bio->bi_opf, ctx)
;
+ struct blk_mq_ctx *ctx;
+ struct blk_mq_hw_ctx *hctx;
bool ret = false;
enum hctx_type type;
if (e && e->type->ops.bio_merge)
bool ret = false;
enum hctx_type type;
if (e && e->type->ops.bio_merge)
- return e->type->ops.bio_merge(
hctx
, bio, nr_segs);
+ return e->type->ops.bio_merge(
q
, bio, nr_segs);
+ ctx = blk_mq_get_ctx(q);
+ hctx = blk_mq_map_queue(q, bio->bi_opf, ctx);
type = hctx->type;
if (!(hctx->flags & BLK_MQ_F_SHOULD_MERGE) ||
list_empty_careful(&ctx->rq_lists[type]))
type = hctx->type;
if (!(hctx->flags & BLK_MQ_F_SHOULD_MERGE) ||
list_empty_careful(&ctx->rq_lists[type]))