diff options
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 00763e510228..7ffceddee420 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
| @@ -667,15 +667,11 @@ cfq_choose_req(struct cfq_data *cfqd, struct request *rq1, struct request *rq2, | |||
| 667 | if (rq2 == NULL) | 667 | if (rq2 == NULL) |
| 668 | return rq1; | 668 | return rq1; |
| 669 | 669 | ||
| 670 | if (rq_is_sync(rq1) && !rq_is_sync(rq2)) | 670 | if (rq_is_sync(rq1) != rq_is_sync(rq2)) |
| 671 | return rq1; | 671 | return rq_is_sync(rq1) ? rq1 : rq2; |
| 672 | else if (rq_is_sync(rq2) && !rq_is_sync(rq1)) | 672 | |
| 673 | return rq2; | 673 | if ((rq1->cmd_flags ^ rq2->cmd_flags) & REQ_META) |
| 674 | if ((rq1->cmd_flags & REQ_META) && !(rq2->cmd_flags & REQ_META)) | 674 | return rq1->cmd_flags & REQ_META ? rq1 : rq2; |
| 675 | return rq1; | ||
| 676 | else if ((rq2->cmd_flags & REQ_META) && | ||
| 677 | !(rq1->cmd_flags & REQ_META)) | ||
| 678 | return rq2; | ||
| 679 | 675 | ||
| 680 | s1 = blk_rq_pos(rq1); | 676 | s1 = blk_rq_pos(rq1); |
| 681 | s2 = blk_rq_pos(rq2); | 677 | s2 = blk_rq_pos(rq2); |