[PATCH v1 09/16] iomap: rename iomap_readpage_ctx struct to iomap_readfolio_ctx

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



->readpage was deprecated and reads are now on folios.

Signed-off-by: Joanne Koong <joannelkoong@xxxxxxxxx>
---
 fs/iomap/buffered-io.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 743112c7f8e6..a3a9b6146c2f 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -317,7 +317,7 @@ static int iomap_read_inline_data(const struct iomap_iter *iter,
 	return 0;
 }
 
-struct iomap_readpage_ctx {
+struct iomap_readfolio_ctx {
 	struct folio		*cur_folio;
 	bool			folio_unlocked;
 	struct readahead_control *rac;
@@ -357,7 +357,7 @@ static void iomap_read_end_io(struct bio *bio)
 }
 
 static void iomap_read_folio_range_async(struct iomap_iter *iter,
-		struct iomap_readpage_ctx *ctx, loff_t pos, size_t plen)
+		struct iomap_readfolio_ctx *ctx, loff_t pos, size_t plen)
 {
 	struct folio *folio = ctx->cur_folio;
 	const struct iomap *iomap = &iter->iomap;
@@ -426,7 +426,7 @@ static void iomap_readfolio_submit(const struct iomap_iter *iter)
 }
 #else
 static void iomap_read_folio_range_async(struct iomap_iter *iter,
-		struct iomap_readpage_ctx *ctx, loff_t pos, size_t len)
+		struct iomap_readfolio_ctx *ctx, loff_t pos, size_t len)
 {
 	WARN_ON_ONCE(1);
 }
@@ -445,7 +445,7 @@ static void iomap_readfolio_submit(const struct iomap_iter *iter)
 #endif /* CONFIG_BLOCK */
 
 static int iomap_readfolio_iter(struct iomap_iter *iter,
-		struct iomap_readpage_ctx *ctx)
+		struct iomap_readfolio_ctx *ctx)
 {
 	const struct iomap *iomap = &iter->iomap;
 	loff_t pos = iter->pos;
@@ -491,7 +491,7 @@ static int iomap_readfolio_iter(struct iomap_iter *iter,
 }
 
 static void iomap_readfolio_complete(const struct iomap_iter *iter,
-		const struct iomap_readpage_ctx *ctx)
+		const struct iomap_readfolio_ctx *ctx)
 {
 	iomap_readfolio_submit(iter);
 
@@ -506,7 +506,7 @@ int iomap_read_folio(struct folio *folio, const struct iomap_ops *ops)
 		.pos		= folio_pos(folio),
 		.len		= folio_size(folio),
 	};
-	struct iomap_readpage_ctx ctx = {
+	struct iomap_readfolio_ctx ctx = {
 		.cur_folio	= folio,
 	};
 	int ret;
@@ -523,7 +523,7 @@ int iomap_read_folio(struct folio *folio, const struct iomap_ops *ops)
 EXPORT_SYMBOL_GPL(iomap_read_folio);
 
 static int iomap_readahead_iter(struct iomap_iter *iter,
-		struct iomap_readpage_ctx *ctx)
+		struct iomap_readfolio_ctx *ctx)
 {
 	int ret;
 
@@ -567,7 +567,7 @@ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops)
 		.pos	= readahead_pos(rac),
 		.len	= readahead_length(rac),
 	};
-	struct iomap_readpage_ctx ctx = {
+	struct iomap_readfolio_ctx ctx = {
 		.rac	= rac,
 	};
 
-- 
2.47.3





[Index of Archives]     [XFS Filesystem Development (older mail)]     [Linux Filesystem Development]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux RAID]     [Linux SCSI]


  Powered by Linux