diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 10:03:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 10:03:29 +0100 |
| commit | 70324494b6f283311c5339fb1795fdec2d8850d9 (patch) | |
| tree | 5a318c2b60ba6e7861d630310d1930f62b8893ce /block/blk-core.c | |
| parent | 73b5301b02c8d3456a5ea64c9ed9802a4a376af6 (diff) | |
| parent | e47a682ace0cd56eb8e09b806c2b0f034b491520 (diff) | |
Merge branch 'spi-linus' into spi-next
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index a33870b1847b..3c95c4d6e31a 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2868,7 +2868,8 @@ static int plug_rq_cmp(void *priv, struct list_head *a, struct list_head *b) struct request *rqa = container_of(a, struct request, queuelist); struct request *rqb = container_of(b, struct request, queuelist); - return !(rqa->q <= rqb->q); + return !(rqa->q < rqb->q || + (rqa->q == rqb->q && blk_rq_pos(rqa) < blk_rq_pos(rqb))); } /* |