The quilt patch titled
Subject: zram: rename __zram_bvec_read to zram_read_page
has been removed from the -mm tree. Its filename was
zram-rename-__zram_bvec_read-to-zram_read_page.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Christoph Hellwig <hch@xxxxxx>
Subject: zram: rename __zram_bvec_read to zram_read_page
Date: Tue, 11 Apr 2023 19:14:51 +0200
__zram_bvec_read doesn't get passed a bvec, but always read a whole page.
Rename it to make the usage more clear.
Link: https://lkml.kernel.org/r/20230411171459.567614-10-hch@xxxxxx
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Sergey Senozhatsky <senozhatsky@xxxxxxxxxxxx>
Acked-by: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/zram_drv.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/block/zram/zram_drv.c~zram-rename-__zram_bvec_read-to-zram_read_page
+++ a/drivers/block/zram/zram_drv.c
@@ -1397,8 +1397,8 @@ static int zram_read_from_zspool(struct
return ret;
}
-static int __zram_bvec_read(struct zram *zram, struct page *page, u32 index,
- struct bio *bio, bool partial_io)
+static int zram_read_page(struct zram *zram, struct page *page, u32 index,
+ struct bio *bio, bool partial_io)
{
int ret;
@@ -1436,7 +1436,7 @@ static int zram_bvec_read(struct zram *z
return -ENOMEM;
}
- ret = __zram_bvec_read(zram, page, index, bio, is_partial_io(bvec));
+ ret = zram_read_page(zram, page, index, bio, is_partial_io(bvec));
if (unlikely(ret))
goto out;
@@ -1593,7 +1593,7 @@ static int zram_bvec_write(struct zram *
if (!page)
return -ENOMEM;
- ret = __zram_bvec_read(zram, page, index, bio, true);
+ ret = zram_read_page(zram, page, index, bio, true);
if (ret)
goto out;
_
Patches currently in -mm which might be from hch@xxxxxx are
zram-directly-call-zram_read_page-in-writeback_store.patch
zram-refactor-zram_bdev_read.patch
zram-dont-pass-a-bvec-to-__zram_bvec_write.patch
zram-refactor-zram_bdev_write.patch
zram-pass-a-page-to-read_from_bdev.patch
zram-dont-return-errors-from-read_from_bdev_async.patch
zram-fix-synchronous-reads.patch
zram-return-errors-from-read_from_bdev_sync.patch
