block: fixup missing conversion from BIO_RW_DISCARD to REQ_DISCARD
Jens Axboe [Tue, 29 Jun 2010 11:33:38 +0000 (13:33 +0200)]
Didn't cause a merge conflict, so fixed this one up manually
post merge.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

block/blk-core.c

index 3531d8e..3c37894 100644 (file)
@@ -1598,7 +1598,7 @@ void submit_bio(int rw, struct bio *bio)
         * If it's a regular read/write or a barrier with data attached,
         * go through the normal accounting stuff before submission.
         */
-       if (bio_has_data(bio) && !(rw & (1 << BIO_RW_DISCARD))) {
+       if (bio_has_data(bio) && !(rw & REQ_DISCARD)) {
                if (rw & WRITE) {
                        count_vm_events(PGPGOUT, count);
                } else {