aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-06-29 13:33:38 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 18:23:41 +0200
commit3ffb52e73b47d6ad86b645942ff49035efdbcd31 (patch)
tree1bc8e681b7b4249c0cbb804014769b0370885c73
parent511d37af66246c67f65e7896c230bdb81d853b6c (diff)
downloadmrst-s0i3-test-3ffb52e73b47d6ad86b645942ff49035efdbcd31.tar.gz
mrst-s0i3-test-3ffb52e73b47d6ad86b645942ff49035efdbcd31.tar.xz
mrst-s0i3-test-3ffb52e73b47d6ad86b645942ff49035efdbcd31.zip
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>
-rw-r--r--block/blk-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 3531d8e1da0..3c3789492c1 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 {