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)
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

Simple merge