aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-06-29 07:33:38 -0400
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 12:23:41 -0400
commit3ffb52e73b47d6ad86b645942ff49035efdbcd31 (patch)
tree1bc8e681b7b4249c0cbb804014769b0370885c73 /block
parent511d37af66246c67f65e7896c230bdb81d853b6c (diff)
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>
Diffstat (limited to 'block')
-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 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)
1598 * If it's a regular read/write or a barrier with data attached, 1598 * If it's a regular read/write or a barrier with data attached,
1599 * go through the normal accounting stuff before submission. 1599 * go through the normal accounting stuff before submission.
1600 */ 1600 */
1601 if (bio_has_data(bio) && !(rw & (1 << BIO_RW_DISCARD))) { 1601 if (bio_has_data(bio) && !(rw & REQ_DISCARD)) {
1602 if (rw & WRITE) { 1602 if (rw & WRITE) {
1603 count_vm_events(PGPGOUT, count); 1603 count_vm_events(PGPGOUT, count);
1604 } else { 1604 } else {