Commit 1b99973f authored Jun 24, 2010 by Tao Ma Committed by Jens Axboe Jun 24, 2010

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>

parent 9e495db1

block/blk-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 {