cfq-iosched: fix merge error
authorJens Axboe <jens.axboe@oracle.com>
Tue, 3 Nov 2009 20:25:45 +0000 (21:25 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 3 Nov 2009 20:25:45 +0000 (21:25 +0100)
commit125c4f221a5352ae08aef2898055b879ad963f01
tree3114b880f0da09535d164923698a7e8d0b700e54
parent2058297d2d045cb57138c33b87cfabcc80e65186
cfq-iosched: fix merge error

We ended up with testing the same condition twice, pretty
pointless. Remove that first if.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/cfq-iosched.c