diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-05-16 08:36:54 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-05-16 11:37:50 -0600 |
| commit | a3e7689bfaae031177ebbb257d5a704b47236044 (patch) | |
| tree | 00ec0c499da452e088fd9350295cbce4f4c6dd42 /block | |
| parent | 5d2ae14276e698c76fa0c8ce870103f343b38263 (diff) | |
| download | linux-stable-a3e7689bfaae031177ebbb257d5a704b47236044.tar.gz linux-stable-a3e7689bfaae031177ebbb257d5a704b47236044.tar.bz2 linux-stable-a3e7689bfaae031177ebbb257d5a704b47236044.zip | |
block: cleanup the VM accounting in submit_bio
submit_bio uses some extremely convoluted checks and confusing comments
to only account REQ_OP_READ/REQ_OP_WRITE comments. Just switch to the
plain obvious checks instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220516063654.2782792-1-hch@lst.de
[axboe: fixup WRITE -> REQ_OP_WRITE]
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index c3f1e46ddd43..23312df7d25d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -892,19 +892,11 @@ void submit_bio(struct bio *bio) if (blkcg_punt_bio_submit(bio)) return; - /* - * 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)) { - unsigned int count = bio_sectors(bio); - - if (op_is_write(bio_op(bio))) { - count_vm_events(PGPGOUT, count); - } else { - task_io_account_read(bio->bi_iter.bi_size); - count_vm_events(PGPGIN, count); - } + if (bio_op(bio) == REQ_OP_READ) { + task_io_account_read(bio->bi_iter.bi_size); + count_vm_events(PGPGIN, bio_sectors(bio)); + } else if (bio_op(bio) == REQ_OP_WRITE) { + count_vm_events(PGPGOUT, bio_sectors(bio)); } /* |