From 0cd97a0372f21a66d1591114d0a12391e8d977d7 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 11 Apr 2023 19:14:57 +0200 Subject: zram: don't return errors from read_from_bdev_async bio_alloc will never return a NULL bio when it is allowed to sleep, and adding a single page to bio with a single vector also can't fail, so switch to the asserting __bio_add_page variant and drop the error returns. Link: https://lkml.kernel.org/r/20230411171459.567614-16-hch@lst.de Signed-off-by: Christoph Hellwig Reviewed-by: Sergey Senozhatsky Acked-by: Minchan Kim Cc: Jens Axboe Signed-off-by: Andrew Morton --- drivers/block/zram/zram_drv.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'drivers/block/zram/zram_drv.c') diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 9a35bb0f1a03..24b31957d9e8 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -585,24 +585,16 @@ static void zram_page_end_io(struct bio *bio) bio_put(bio); } -/* - * Returns 1 if the submission is successful. - */ -static int read_from_bdev_async(struct zram *zram, struct page *page, +static void read_from_bdev_async(struct zram *zram, struct page *page, unsigned long entry, struct bio *parent) { struct bio *bio; bio = bio_alloc(zram->bdev, 1, parent ? parent->bi_opf : REQ_OP_READ, GFP_NOIO); - if (!bio) - return -ENOMEM; bio->bi_iter.bi_sector = entry * (PAGE_SIZE >> 9); - if (!bio_add_page(bio, page, PAGE_SIZE, 0)) { - bio_put(bio); - return -EIO; - } + __bio_add_page(bio, page, PAGE_SIZE, 0); if (!parent) bio->bi_end_io = zram_page_end_io; @@ -610,7 +602,6 @@ static int read_from_bdev_async(struct zram *zram, struct page *page, bio_chain(bio, parent); submit_bio(bio); - return 1; } #define PAGE_WB_SIG "page_index=" @@ -840,7 +831,8 @@ static int read_from_bdev(struct zram *zram, struct page *page, return -EIO; return read_from_bdev_sync(zram, page, entry, parent); } - return read_from_bdev_async(zram, page, entry, parent); + read_from_bdev_async(zram, page, entry, parent); + return 1; } #else static inline void reset_bdev(struct zram *zram) {}; -- cgit