diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/cfq-iosched.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index e2f80463ed0d..a0e5347767d9 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
| @@ -1513,9 +1513,6 @@ static int cfq_allow_merge(struct request_queue *q, struct request *rq, | |||
| 1513 | struct cfq_io_context *cic; | 1513 | struct cfq_io_context *cic; |
| 1514 | struct cfq_queue *cfqq; | 1514 | struct cfq_queue *cfqq; |
| 1515 | 1515 | ||
| 1516 | /* Deny merge if bio and rq don't belong to same cfq group */ | ||
| 1517 | if ((RQ_CFQQ(rq))->cfqg != cfq_get_cfqg(cfqd, 0)) | ||
| 1518 | return false; | ||
| 1519 | /* | 1516 | /* |
| 1520 | * Disallow merge of a sync bio into an async request. | 1517 | * Disallow merge of a sync bio into an async request. |
| 1521 | */ | 1518 | */ |