aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Ma <tao.ma@oracle.com>2010-06-24 07:43:57 +0800
committerJens Axboe <jaxboe@fusionio.com>2010-06-24 08:14:22 +0200
commit1b99973f1c82707e46e8cb9416865a1e955e8f8c (patch)
treeb264a9cbd3a36016d312484dcad38f778122af49
parent9e495db1a1f931e82c9edccd677dd171be5b85d2 (diff)
downloadmrst-s0i3-test-1b99973f1c82707e46e8cb9416865a1e955e8f8c.tar.gz
mrst-s0i3-test-1b99973f1c82707e46e8cb9416865a1e955e8f8c.tar.xz
mrst-s0i3-test-1b99973f1c82707e46e8cb9416865a1e955e8f8c.zip
block: Don't count_vm_events for discard bio in submit_bio.
In submit_bio, we count vm events by check READ/WRITE. But actually DISCARD_NOBARRIER also has the WRITE flag set. It looks as if in blkdev_issue_discard, we also add a page as the payload and the bio_has_data check isn't enough. So add another check for discard bio. Signed-off-by: Tao Ma <tao.ma@oracle.com> 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 3deca77e025..f0640d7f800 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1583,7 +1583,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 {