projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[cascardo/linux.git]
/
block
/
blk-mq.c
diff --git
a/block/blk-mq.c
b/block/blk-mq.c
index
ddc2eed
..
f3d27a6
100644
(file)
--- a/
block/blk-mq.c
+++ b/
block/blk-mq.c
@@
-1217,9
+1217,9
@@
static struct request *blk_mq_map_request(struct request_queue *q,
blk_mq_set_alloc_data(&alloc_data, q, 0, ctx, hctx);
rq = __blk_mq_alloc_request(&alloc_data, op, op_flags);
blk_mq_set_alloc_data(&alloc_data, q, 0, ctx, hctx);
rq = __blk_mq_alloc_request(&alloc_data, op, op_flags);
-
hctx->queued++
;
- data->
hctx = h
ctx;
- data->
ctx = ctx
;
+
data->hctx = alloc_data.hctx
;
+ data->
ctx = alloc_data.
ctx;
+ data->
hctx->queued++
;
return rq;
}
return rq;
}