diff options
| author | Tao Ma <tao.ma@oracle.com> | 2010-06-24 07:43:57 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 10:30:18 -0700 |
| commit | caf785bc19966cedc0ba3ee43526e0af43bd001a (patch) | |
| tree | b1d0ad385fb75ad267016e9ae6636a96129029f8 /block | |
| parent | 89dd01dc14e0c7d069f96c78c0929823c8734c0b (diff) | |
block: Don't count_vm_events for discard bio in submit_bio.
commit 1b99973f1c82707e46e8cb9416865a1e955e8f8c upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 9fe174dc74d1..dd9795d88683 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1556,7 +1556,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 { |