diff options
Diffstat (limited to 'block')
| -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, struct request *rq; bool ret = false; + if (blk_queue_nomerges(q)) + goto out; + plug = current->plug; if (!plug) goto out; |