diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-04-11 19:14:47 +0200 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-04-18 16:29:57 -0700 |
| commit | d6eea0097e26769fb58c2773214c3bda85d1678a (patch) | |
| tree | af0ddee440248aca1f049498aecfaf94450732d5 /drivers/block | |
| parent | af8b04c63708fa730c0257084fab91fb2a9cecc4 (diff) | |
| download | lwn-d6eea0097e26769fb58c2773214c3bda85d1678a.tar.gz lwn-d6eea0097e26769fb58c2773214c3bda85d1678a.zip | |
zram: move discard handling to zram_submit_bio
Switch on the bio operation in zram_submit_bio and only call into
__zram_make_request for read and write operations.
Link: https://lkml.kernel.org/r/20230411171459.567614-6-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/zram/zram_drv.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index e13c7d8e283b..00f13eb1c800 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1958,15 +1958,6 @@ static void __zram_make_request(struct zram *zram, struct bio *bio) struct bio_vec bv; unsigned long start_time; - switch (bio_op(bio)) { - case REQ_OP_DISCARD: - case REQ_OP_WRITE_ZEROES: - zram_bio_discard(zram, bio); - return; - default: - break; - } - start_time = bio_start_io_acct(bio); bio_for_each_segment(bv, bio, iter) { u32 index = iter.bi_sector >> SECTORS_PER_PAGE_SHIFT; @@ -1990,7 +1981,19 @@ static void zram_submit_bio(struct bio *bio) { struct zram *zram = bio->bi_bdev->bd_disk->private_data; - __zram_make_request(zram, bio); + switch (bio_op(bio)) { + case REQ_OP_READ: + case REQ_OP_WRITE: + __zram_make_request(zram, bio); + break; + case REQ_OP_DISCARD: + case REQ_OP_WRITE_ZEROES: + zram_bio_discard(zram, bio); + break; + default: + WARN_ON_ONCE(1); + bio_endio(bio); + } } static void zram_slot_free_notify(struct block_device *bdev, |