From: Jens Axboe <jaxboe@fusionio.com>
Date: Tue, 29 Jun 2010 11:33:38 +0000 (+0200)
Subject: block: fixup missing conversion from BIO_RW_DISCARD to REQ_DISCARD
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3ffb52e73b47d6ad86b645942ff49035efdbcd31;p=linux-beck.git

block: fixup missing conversion from BIO_RW_DISCARD to REQ_DISCARD

Didn't cause a merge conflict, so fixed this one up manually
post merge.

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

diff --git a/block/blk-core.c b/block/blk-core.c
index 3531d8e1da04..3c3789492c10 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -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 {