iomap: rename iomap_readpage_ctx struct to iomap_read_folio_ctx
->readpage was deprecated and reads are now on folios. Signed-off-by: Joanne Koong <joannelkoong@gmail.com> Tested-by: syzbot@syzkaller.appspotmail.com Reviewed-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
committed by
Christian Brauner
parent
8805a9c64b
commit
87a13819dd
@@ -360,14 +360,14 @@ static void iomap_read_end_io(struct bio *bio)
|
||||
bio_put(bio);
|
||||
}
|
||||
|
||||
struct iomap_readpage_ctx {
|
||||
struct iomap_read_folio_ctx {
|
||||
struct folio *cur_folio;
|
||||
bool cur_folio_in_bio;
|
||||
void *read_ctx;
|
||||
struct readahead_control *rac;
|
||||
};
|
||||
|
||||
static void iomap_bio_submit_read(struct iomap_readpage_ctx *ctx)
|
||||
static void iomap_bio_submit_read(struct iomap_read_folio_ctx *ctx)
|
||||
{
|
||||
struct bio *bio = ctx->read_ctx;
|
||||
|
||||
@@ -376,7 +376,7 @@ static void iomap_bio_submit_read(struct iomap_readpage_ctx *ctx)
|
||||
}
|
||||
|
||||
static void iomap_bio_read_folio_range(const struct iomap_iter *iter,
|
||||
struct iomap_readpage_ctx *ctx, loff_t pos, size_t plen)
|
||||
struct iomap_read_folio_ctx *ctx, loff_t pos, size_t plen)
|
||||
{
|
||||
struct folio *folio = ctx->cur_folio;
|
||||
const struct iomap *iomap = &iter->iomap;
|
||||
@@ -423,7 +423,7 @@ static void iomap_bio_read_folio_range(const struct iomap_iter *iter,
|
||||
}
|
||||
|
||||
static int iomap_read_folio_iter(struct iomap_iter *iter,
|
||||
struct iomap_readpage_ctx *ctx)
|
||||
struct iomap_read_folio_ctx *ctx)
|
||||
{
|
||||
const struct iomap *iomap = &iter->iomap;
|
||||
loff_t pos = iter->pos;
|
||||
@@ -479,7 +479,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_read_folio_ctx ctx = {
|
||||
.cur_folio = folio,
|
||||
};
|
||||
int ret;
|
||||
@@ -504,7 +504,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_read_folio_ctx *ctx)
|
||||
{
|
||||
int ret;
|
||||
|
||||
@@ -551,7 +551,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_read_folio_ctx ctx = {
|
||||
.rac = rac,
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user