iomap: Rename page_done handler to put_folio
The ->page_done() handler in struct iomap_page_ops is now somewhat misnamed in that it mainly deals with unlocking and putting a folio, so rename it to ->put_folio(). Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Родитель
80baab88bb
Коммит
40405dddd9
|
@ -967,7 +967,7 @@ static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos,
|
|||
return gfs2_trans_begin(sdp, RES_DINODE + blocks, 0);
|
||||
}
|
||||
|
||||
static void gfs2_iomap_page_done(struct inode *inode, loff_t pos,
|
||||
static void gfs2_iomap_put_folio(struct inode *inode, loff_t pos,
|
||||
unsigned copied, struct folio *folio)
|
||||
{
|
||||
struct gfs2_trans *tr = current->journal_info;
|
||||
|
@ -994,7 +994,7 @@ static void gfs2_iomap_page_done(struct inode *inode, loff_t pos,
|
|||
|
||||
static const struct iomap_page_ops gfs2_iomap_page_ops = {
|
||||
.page_prepare = gfs2_iomap_page_prepare,
|
||||
.page_done = gfs2_iomap_page_done,
|
||||
.put_folio = gfs2_iomap_put_folio,
|
||||
};
|
||||
|
||||
static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos,
|
||||
|
|
|
@ -580,8 +580,8 @@ static void __iomap_put_folio(struct iomap_iter *iter, loff_t pos, size_t ret,
|
|||
{
|
||||
const struct iomap_page_ops *page_ops = iter->iomap.page_ops;
|
||||
|
||||
if (page_ops && page_ops->page_done) {
|
||||
page_ops->page_done(iter->inode, pos, ret, folio);
|
||||
if (page_ops && page_ops->put_folio) {
|
||||
page_ops->put_folio(iter->inode, pos, ret, folio);
|
||||
} else if (folio) {
|
||||
folio_unlock(folio);
|
||||
folio_put(folio);
|
||||
|
|
|
@ -126,18 +126,18 @@ static inline bool iomap_inline_data_valid(const struct iomap *iomap)
|
|||
|
||||
/*
|
||||
* When a filesystem sets page_ops in an iomap mapping it returns, page_prepare
|
||||
* and page_done will be called for each page written to. This only applies to
|
||||
* buffered writes as unbuffered writes will not typically have pages
|
||||
* and put_folio will be called for each folio written to. This only applies
|
||||
* to buffered writes as unbuffered writes will not typically have folios
|
||||
* associated with them.
|
||||
*
|
||||
* When page_prepare succeeds, page_done will always be called to do any
|
||||
* cleanup work necessary. In that page_done call, @folio will be NULL if the
|
||||
* associated folio could not be obtained. When folio is not NULL, page_done
|
||||
* When page_prepare succeeds, put_folio will always be called to do any
|
||||
* cleanup work necessary. In that put_folio call, @folio will be NULL if the
|
||||
* associated folio could not be obtained. When folio is not NULL, put_folio
|
||||
* is responsible for unlocking and putting the folio.
|
||||
*/
|
||||
struct iomap_page_ops {
|
||||
int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len);
|
||||
void (*page_done)(struct inode *inode, loff_t pos, unsigned copied,
|
||||
void (*put_folio)(struct inode *inode, loff_t pos, unsigned copied,
|
||||
struct folio *folio);
|
||||
|
||||
/*
|
||||
|
|
Загрузка…
Ссылка в новой задаче