On Mon, Jun 23, 2025 at 07:21:35PM -0700, Joanne Koong wrote:
> struct iomap_writepage_ctx includes a pointer to the file inode. In
> writeback, use that instead of also passing the inode into
> fuse_fill_wb_data.
>
> No functional changes.
>
> Signed-off-by: Joanne Koong <joannelkoong@xxxxxxxxx>
Looks good,
Reviewed-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
--D
> ---
> fs/fuse/file.c | 27 ++++++++++++---------------
> 1 file changed, 12 insertions(+), 15 deletions(-)
>
> diff --git a/fs/fuse/file.c b/fs/fuse/file.c
> index 865d04b8ef31..4f17ba69ddfc 100644
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@ -2070,16 +2070,16 @@ struct fuse_fill_wb_data {
> unsigned int nr_bytes;
> };
>
> -static bool fuse_pages_realloc(struct fuse_fill_wb_data *data)
> +static bool fuse_pages_realloc(struct fuse_fill_wb_data *data,
> + unsigned int max_pages)
> {
> struct fuse_args_pages *ap = &data->wpa->ia.ap;
> - struct fuse_conn *fc = get_fuse_conn(data->inode);
> struct folio **folios;
> struct fuse_folio_desc *descs;
> unsigned int nfolios = min_t(unsigned int,
> max_t(unsigned int, data->max_folios * 2,
> FUSE_DEFAULT_MAX_PAGES_PER_REQ),
> - fc->max_pages);
> + max_pages);
> WARN_ON(nfolios <= data->max_folios);
>
> folios = fuse_folios_alloc(nfolios, GFP_NOFS, &descs);
> @@ -2096,10 +2096,10 @@ static bool fuse_pages_realloc(struct fuse_fill_wb_data *data)
> return true;
> }
>
> -static void fuse_writepages_send(struct fuse_fill_wb_data *data)
> +static void fuse_writepages_send(struct inode *inode,
> + struct fuse_fill_wb_data *data)
> {
> struct fuse_writepage_args *wpa = data->wpa;
> - struct inode *inode = data->inode;
> struct fuse_inode *fi = get_fuse_inode(inode);
>
> spin_lock(&fi->lock);
> @@ -2134,7 +2134,8 @@ static bool fuse_writepage_need_send(struct fuse_conn *fc, struct folio *folio,
> return true;
>
> /* Need to grow the pages array? If so, did the expansion fail? */
> - if (ap->num_folios == data->max_folios && !fuse_pages_realloc(data))
> + if (ap->num_folios == data->max_folios &&
> + !fuse_pages_realloc(data, fc->max_pages))
> return true;
>
> return false;
> @@ -2147,7 +2148,7 @@ static ssize_t fuse_iomap_writeback_range(struct iomap_writepage_ctx *wpc,
> struct fuse_fill_wb_data *data = wpc->wb_ctx;
> struct fuse_writepage_args *wpa = data->wpa;
> struct fuse_args_pages *ap = &wpa->ia.ap;
> - struct inode *inode = data->inode;
> + struct inode *inode = wpc->inode;
> struct fuse_inode *fi = get_fuse_inode(inode);
> struct fuse_conn *fc = get_fuse_conn(inode);
> loff_t offset = offset_in_folio(folio, pos);
> @@ -2165,7 +2166,7 @@ static ssize_t fuse_iomap_writeback_range(struct iomap_writepage_ctx *wpc,
> iomap_start_folio_write(inode, folio, 1);
>
> if (wpa && fuse_writepage_need_send(fc, folio, offset, len, ap, data)) {
> - fuse_writepages_send(data);
> + fuse_writepages_send(inode, data);
> data->wpa = NULL;
> data->nr_bytes = 0;
> }
> @@ -2199,7 +2200,7 @@ static int fuse_iomap_writeback_submit(struct iomap_writepage_ctx *wpc,
>
> if (data->wpa) {
> WARN_ON(!data->wpa->ia.ap.num_folios);
> - fuse_writepages_send(data);
> + fuse_writepages_send(wpc->inode, data);
> }
>
> if (data->ff)
> @@ -2218,9 +2219,7 @@ static int fuse_writepages(struct address_space *mapping,
> {
> struct inode *inode = mapping->host;
> struct fuse_conn *fc = get_fuse_conn(inode);
> - struct fuse_fill_wb_data data = {
> - .inode = inode,
> - };
> + struct fuse_fill_wb_data data = {};
> struct iomap_writepage_ctx wpc = {
> .inode = inode,
> .iomap.type = IOMAP_MAPPED,
> @@ -2242,9 +2241,7 @@ static int fuse_writepages(struct address_space *mapping,
> static int fuse_launder_folio(struct folio *folio)
> {
> int err = 0;
> - struct fuse_fill_wb_data data = {
> - .inode = folio->mapping->host,
> - };
> + struct fuse_fill_wb_data data = {};
> struct iomap_writepage_ctx wpc = {
> .inode = folio->mapping->host,
> .iomap.type = IOMAP_MAPPED,
> --
> 2.47.1
>
>
