diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-06-29 13:23:14 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-29 13:23:14 +0200 |
| commit | 8c9135269a1d3d3181202b91537d8ec1b967e2a4 (patch) | |
| tree | 5d195aa584fe8e94033753730e444058009f408d /block | |
| parent | b3142735d290fae3a7444e6a3fc2b3d68d43b3d8 (diff) | |
| parent | 6002323b9f6971f38517617170e84b04df0a9bd1 (diff) | |
Merge branch 'for-linus' into for-2.6.36
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 98b4ceed263e..3531d8e1da04 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)) { + if (bio_has_data(bio) && !(rw & (1 << BIO_RW_DISCARD))) { if (rw & WRITE) { count_vm_events(PGPGOUT, count); } else { |