diff options
Diffstat (limited to 'block/blk-core.c')
-rw-r--r-- | block/blk-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index fce4b9387f36..25f13479f552 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -1429,6 +1429,9 @@ static bool attempt_plug_merge(struct request_queue *q, struct bio *bio, | |||
1429 | struct request *rq; | 1429 | struct request *rq; |
1430 | bool ret = false; | 1430 | bool ret = false; |
1431 | 1431 | ||
1432 | if (blk_queue_nomerges(q)) | ||
1433 | goto out; | ||
1434 | |||
1432 | plug = current->plug; | 1435 | plug = current->plug; |
1433 | if (!plug) | 1436 | if (!plug) |
1434 | goto out; | 1437 | goto out; |