diff options
author | Jens Axboe <axboe@kernel.dk> | 2012-05-01 08:29:55 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-05-01 08:29:55 -0400 |
commit | 0b7877d4eea3f93e3dd941999522bbd8c538cb53 (patch) | |
tree | ade6d4e411b9b9b569c802e3b2179826162c934c /block/blk-core.c | |
parent | bd1a68b59c8e3bce45fb76632c64e1e063c3962d (diff) | |
parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) |
Merge tag 'v3.4-rc5' into for-3.5/core
The core branch is behind driver commits that we want to build
on for 3.5, hence I'm pulling in a later -rc.
Linux 3.4-rc5
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-core.c')
-rw-r--r-- | block/blk-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 6cf13df43c80..3c923a7aeb56 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -542,7 +542,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) | |||
542 | if (!q) | 542 | if (!q) |
543 | return NULL; | 543 | return NULL; |
544 | 544 | ||
545 | q->id = ida_simple_get(&blk_queue_ida, 0, 0, GFP_KERNEL); | 545 | q->id = ida_simple_get(&blk_queue_ida, 0, 0, gfp_mask); |
546 | if (q->id < 0) | 546 | if (q->id < 0) |
547 | goto fail_q; | 547 | goto fail_q; |
548 | 548 | ||
@@ -1372,7 +1372,8 @@ static bool attempt_plug_merge(struct request_queue *q, struct bio *bio, | |||
1372 | list_for_each_entry_reverse(rq, &plug->list, queuelist) { | 1372 | list_for_each_entry_reverse(rq, &plug->list, queuelist) { |
1373 | int el_ret; | 1373 | int el_ret; |
1374 | 1374 | ||
1375 | (*request_count)++; | 1375 | if (rq->q == q) |
1376 | (*request_count)++; | ||
1376 | 1377 | ||
1377 | if (rq->q != q || !blk_rq_merge_ok(rq, bio)) | 1378 | if (rq->q != q || !blk_rq_merge_ok(rq, bio)) |
1378 | continue; | 1379 | continue; |