From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F64D24E4C3; Thu, 2 Jul 2026 16:58:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783011524; cv=none; b=K8d6i4sT68LWnLKTwIHm1rlr2x2Vq8opK6TPZ/46bajvLvz8KxWJxJe7n9myFejti2+FLOS641dzdN694FO9TfFnSWJGl9suEBfjZPNHEANXWeY2SVCjxyFDT4m7GtqhfwIApSJFN7HRahmjaukB8FlnaOOUqjMvD0tZpob3czs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783011524; c=relaxed/simple; bh=RksY6spesc/RoHAYv/aQp+bjn/v8Ix3DpuSmFQ9PvD8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=rAePnmSknBze0cxjFFDOLt6KmTS/q6bRYz5CuYa2oIwAF2B1gZjKNUOp9dbzTYbj6QcUG6Jdpa456lozIb3RlJha3vWa4IA5DdWqwu7c9m9rI9r2choonEoxKFkZ98IU/sItXVUhek9jhNOnkxrZeJmNv28TwhhAs7FDDeNk+D0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CrRX4a4t; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CrRX4a4t" Received: by smtp.kernel.org (Postfix) with UTF8SMTPSA id 1D9BD1F00A3E; Thu, 2 Jul 2026 16:58:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783011522; bh=Zb5EXf2ovo6UufrOrmxA5aKxNooLmPywNDd7EorJKw0=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=CrRX4a4txrvnJFsq8oC4/tLM23WGjr79R1MaXHPIntlbz2i82r3XLtXpgw8yN0y81 uVPZwMvQWPGXeBAGsB0vu+rPz0S+03F5LZog1LWuHUbljjzyinbiqS7hwgE6pMLtni kIcIkwwmhVGuEVlC9PmMCFRyz83W7+dpUMYRGeF2PzLvkpPPvucfC2gc3XYHg0YTX1 34IGxmH9rtPnDL7P3ZRRwWGXsxm4IWB5M48pvwPNmXpuadV56EWnisVxXG+RilRucL rWTku0kZz+GuPQWu4VyLMbxCf0ZeKbR+IM7Y8gEic3vFhVJd5LQ0CNduVtqkyxq6nk 4aGi0F4S/+HHA== Date: Thu, 2 Jul 2026 09:58:41 -0700 From: "Darrick J. Wong" To: Joanne Koong Cc: brauner@kernel.org, hch@lst.de, willy@infradead.org, hsiangkao@linux.alibaba.com, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, Jens Axboe , Chris Mason , David Sterba , Alexander Viro , Jan Kara , Dan Williams , Gao Xiang , Chao Yu , Yue Hu , Jeffle Xu , Sandeep Dhavale , Hongbo Li , Chunhai Guo , Namjae Jeon , Sungjong Seo , Yuezhang Mo , Theodore Ts'o , Andreas Dilger , Baokun Li , Ojaswin Mujoo , "Ritesh Harjani (IBM)" , Zhang Yi , Jaegeuk Kim , Miklos Szeredi , Andreas Gruenbacher , Mikulas Patocka , Hyunchul Lee , Konstantin Komarov , Carlos Maiolino , Damien Le Moal , Naohiro Aota , Johannes Thumshirn , "open list:BLOCK LAYER" , open list , "open list:BTRFS FILE SYSTEM" , "open list:FILESYSTEM DIRECT ACCESS (DAX)" , "open list:EROFS FILE SYSTEM" , "open list:EXT2 FILE SYSTEM" , "open list:F2FS FILE SYSTEM" , "open list:FUSE FILESYSTEM [CORE]" , "open list:GFS2 FILE SYSTEM" , "open list:NTFS3 FILESYSTEM" Subject: Re: [PATCH v2 17/18] iomap: pass iomap_next_fn directly instead of struct iomap_ops Message-ID: <20260702165841.GM9392@frogsfrogsfrogs> References: <20260701000949.1666714-1-joannelkoong@gmail.com> <20260701000949.1666714-18-joannelkoong@gmail.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260701000949.1666714-18-joannelkoong@gmail.com> On Tue, Jun 30, 2026 at 05:09:32PM -0700, Joanne Koong wrote: > Now that all filesystems implement ->iomap_next() and the legacy > ->iomap_begin()/->iomap_end() fallback is gone, struct iomap_ops only > wraps a single iomap_next function pointer. Drop the struct entirely and > pass the iomap_next_fn directly to iomap_iter() and all the iomap/dax > entry points; filesystems pass their ->iomap_next function instead of an > ops struct. > > No functional change intended. > > Signed-off-by: Joanne Koong I'm gonna cut out quite a bit of this patch to reduce the reply size. > --- > fs/iomap/buffered-io.c | 38 ++++++++++++++--------------- > fs/iomap/direct-io.c | 8 +++--- > fs/iomap/fiemap.c | 8 +++--- > fs/iomap/iter.c | 8 +++--- > fs/iomap/seek.c | 8 +++--- > fs/iomap/swapfile.c | 4 +-- > fs/remap_range.c | 6 ++--- > fs/xfs/xfs_aops.c | 8 +++--- > fs/xfs/xfs_file.c | 40 +++++++++++++++--------------- > fs/xfs/xfs_iomap.c | 55 +++++++++--------------------------------- > fs/xfs/xfs_iomap.h | 24 ++++++++++++------ > fs/xfs/xfs_iops.c | 4 +-- > fs/xfs/xfs_reflink.c | 6 ++--- > fs/zonefs/file.c | 22 ++++++----------- > include/linux/dax.h | 18 ++++++-------- > include/linux/fs.h | 7 ++++-- > include/linux/iomap.h | 46 +++++++++++++++-------------------- > 54 files changed, 302 insertions(+), 411 deletions(-) > > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 3f0932e46fd6..0aa8abc438c1 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -626,7 +626,7 @@ static int iomap_read_folio_iter(struct iomap_iter *iter, > return 0; > } > > -void iomap_read_folio(const struct iomap_ops *ops, > +void iomap_read_folio(iomap_next_fn iomap_next, If you took my earlier suggestion to rename the typedef to iomap_iter_fn, then this parameter ought to be named iter_fn. > struct iomap_read_folio_ctx *ctx, void *private) > { > struct folio *folio = ctx->cur_folio; > @@ -650,7 +650,7 @@ void iomap_read_folio(const struct iomap_ops *ops, > fsverity_readahead(ctx->vi, folio->index, > folio_nr_pages(folio)); > > - while ((ret = iomap_iter(&iter, ops)) > 0) { > + while ((ret = iomap_iter(&iter, iomap_next)) > 0) { > iter.status = iomap_read_folio_iter(&iter, ctx, > &bytes_submitted); > iomap_read_submit(&iter, ctx); > @@ -688,22 +688,22 @@ static int iomap_readahead_iter(struct iomap_iter *iter, > > /** > * iomap_readahead - Attempt to read pages from a file. > - * @ops: The operations vector for the filesystem. > + * @iomap_next: The iomap_next callback for the filesystem. "The iomap iteration function for the filesystem" ? Using the term "iomap_next" in the definition for iomap_next isn't that helpful. > * @ctx: The ctx used for issuing readahead. > * @private: The filesystem-specific information for issuing iomap_iter. > * > * This function is for filesystems to call to implement their readahead > * address_space operation. > * > - * Context: The @ops callbacks may submit I/O (eg to read the addresses of > + * Context: The @iomap_next callback may submit I/O (eg to read the addresses of > * blocks from disc), and may wait for it. The caller may be trying to > * access a different page, and so sleeping excessively should be avoided. > * It may allocate memory, but should avoid costly allocations. This > * function is called with memalloc_nofs set, so allocations will not cause > * the filesystem to be reentered. > */ > -void iomap_readahead(const struct iomap_ops *ops, > - struct iomap_read_folio_ctx *ctx, void *private) > +void iomap_readahead(iomap_next_fn iomap_next, struct iomap_read_folio_ctx *ctx, > + void *private) > { > struct readahead_control *rac = ctx->rac; > struct iomap_iter iter = { > @@ -725,7 +725,7 @@ void iomap_readahead(const struct iomap_ops *ops, > fsverity_readahead(ctx->vi, readahead_index(rac), > readahead_count(rac)); > > - while (iomap_iter(&iter, ops) > 0) { > + while (iomap_iter(&iter, iomap_next) > 0) { > iter.status = iomap_readahead_iter(&iter, ctx, > &cur_bytes_submitted); > iomap_read_submit(&iter, ctx); > @@ -1268,7 +1268,7 @@ static int iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i, > > ssize_t > iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i, > - const struct iomap_ops *ops, > + iomap_next_fn iomap_next, > const struct iomap_write_ops *write_ops, void *private) > { > struct iomap_iter iter = { > @@ -1285,7 +1285,7 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i, > if (iocb->ki_flags & IOCB_DONTCACHE) > iter.flags |= IOMAP_DONTCACHE; > > - while ((ret = iomap_iter(&iter, ops)) > 0) > + while ((ret = iomap_iter(&iter, iomap_next)) > 0) > iter.status = iomap_write_iter(&iter, i, write_ops); > > if (unlikely(iter.pos == iocb->ki_pos)) > @@ -1297,7 +1297,7 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i, > EXPORT_SYMBOL_GPL(iomap_file_buffered_write); > > int iomap_fsverity_write(struct file *file, loff_t pos, size_t length, > - const void *buf, const struct iomap_ops *ops, > + const void *buf, iomap_next_fn iomap_next, > const struct iomap_write_ops *write_ops) > { > int ret; > @@ -1314,7 +1314,7 @@ int iomap_fsverity_write(struct file *file, loff_t pos, size_t length, > > iov_iter_kvec(&iiter, WRITE, &kvec, 1, length); > > - ret = iomap_file_buffered_write(&iocb, &iiter, ops, write_ops, NULL); > + ret = iomap_file_buffered_write(&iocb, &iiter, iomap_next, write_ops, NULL); > if (ret < 0) > return ret; > return ret == length ? 0 : -EIO; > @@ -1586,7 +1586,7 @@ static int iomap_unshare_iter(struct iomap_iter *iter, > > int > iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len, > - const struct iomap_ops *ops, > + iomap_next_fn iomap_next, > const struct iomap_write_ops *write_ops) > { > struct iomap_iter iter = { > @@ -1601,7 +1601,7 @@ iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len, > return 0; > > iter.len = min(len, size - pos); > - while ((ret = iomap_iter(&iter, ops)) > 0) > + while ((ret = iomap_iter(&iter, iomap_next)) > 0) > iter.status = iomap_unshare_iter(&iter, write_ops); > return ret; > } > @@ -1710,7 +1710,7 @@ EXPORT_SYMBOL_GPL(iomap_fill_dirty_folios); > > int > iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, bool *did_zero, > - const struct iomap_ops *ops, > + iomap_next_fn iomap_next, > const struct iomap_write_ops *write_ops, void *private) > { > struct folio_batch fbatch; > @@ -1735,7 +1735,7 @@ iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, bool *did_zero, > */ > range_dirty = filemap_range_needs_writeback(mapping, iter.pos, > iter.pos + iter.len - 1); > - while ((ret = iomap_iter(&iter, ops)) > 0) { > + while ((ret = iomap_iter(&iter, iomap_next)) > 0) { > const struct iomap *srcmap = iomap_iter_srcmap(&iter); > > if (!(iter.iomap.flags & IOMAP_F_FOLIO_BATCH) && > @@ -1761,7 +1761,7 @@ EXPORT_SYMBOL_GPL(iomap_zero_range); > > int > iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero, > - const struct iomap_ops *ops, > + iomap_next_fn iomap_next, > const struct iomap_write_ops *write_ops, void *private) > { > unsigned int blocksize = i_blocksize(inode); > @@ -1770,7 +1770,7 @@ iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero, > /* Block boundary? Nothing to do */ > if (!off) > return 0; > - return iomap_zero_range(inode, pos, blocksize - off, did_zero, ops, > + return iomap_zero_range(inode, pos, blocksize - off, did_zero, iomap_next, > write_ops, private); > } > EXPORT_SYMBOL_GPL(iomap_truncate_page); > @@ -1795,7 +1795,7 @@ static int iomap_folio_mkwrite_iter(struct iomap_iter *iter, > return iomap_iter_advance(iter, length); > } > > -vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops, > +vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, iomap_next_fn iomap_next, > void *private) > { > struct iomap_iter iter = { > @@ -1812,7 +1812,7 @@ vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops, > goto out_unlock; > iter.pos = folio_pos(folio); > iter.len = ret; > - while ((ret = iomap_iter(&iter, ops)) > 0) > + while ((ret = iomap_iter(&iter, iomap_next)) > 0) > iter.status = iomap_folio_mkwrite_iter(&iter, folio); > > if (ret < 0) > diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c > index b485e3b191da..e299d186f743 100644 > --- a/fs/iomap/direct-io.c > +++ b/fs/iomap/direct-io.c > @@ -676,7 +676,7 @@ static int iomap_dio_iter(struct iomap_iter *iter, struct iomap_dio *dio) > */ > struct iomap_dio * > __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, > - const struct iomap_ops *ops, const struct iomap_dio_ops *dops, > + iomap_next_fn iomap_next, const struct iomap_dio_ops *dops, > unsigned int dio_flags, void *private, size_t done_before) > { > struct inode *inode = file_inode(iocb->ki_filp); > @@ -800,7 +800,7 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, > inode_dio_begin(inode); > > blk_start_plug(&plug); > - while ((ret = iomap_iter(&iomi, ops)) > 0) { > + while ((ret = iomap_iter(&iomi, iomap_next)) > 0) { > iomi.status = iomap_dio_iter(&iomi, dio); > > /* > @@ -890,12 +890,12 @@ EXPORT_SYMBOL_GPL(__iomap_dio_rw); > > ssize_t > iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, > - const struct iomap_ops *ops, const struct iomap_dio_ops *dops, > + iomap_next_fn iomap_next, const struct iomap_dio_ops *dops, > unsigned int dio_flags, void *private, size_t done_before) > { > struct iomap_dio *dio; > > - dio = __iomap_dio_rw(iocb, iter, ops, dops, dio_flags, private, > + dio = __iomap_dio_rw(iocb, iter, iomap_next, dops, dio_flags, private, > done_before); > if (IS_ERR_OR_NULL(dio)) > return PTR_ERR_OR_ZERO(dio); > diff --git a/fs/iomap/fiemap.c b/fs/iomap/fiemap.c > index d11dadff8286..fc488f05d8ce 100644 > --- a/fs/iomap/fiemap.c > +++ b/fs/iomap/fiemap.c > @@ -56,7 +56,7 @@ static int iomap_fiemap_iter(struct iomap_iter *iter, > } > > int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi, > - u64 start, u64 len, const struct iomap_ops *ops) > + u64 start, u64 len, iomap_next_fn iomap_next) > { > struct iomap_iter iter = { > .inode = inode, > @@ -73,7 +73,7 @@ int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi, > if (ret) > return ret; > > - while ((ret = iomap_iter(&iter, ops)) > 0) > + while ((ret = iomap_iter(&iter, iomap_next)) > 0) > iter.status = iomap_fiemap_iter(&iter, fi, &prev); > > if (prev.type != IOMAP_HOLE) { > @@ -92,7 +92,7 @@ EXPORT_SYMBOL_GPL(iomap_fiemap); > /* legacy ->bmap interface. 0 is the error return (!) */ > sector_t > iomap_bmap(struct address_space *mapping, sector_t bno, > - const struct iomap_ops *ops) > + iomap_next_fn iomap_next) > { > struct iomap_iter iter = { > .inode = mapping->host, > @@ -107,7 +107,7 @@ iomap_bmap(struct address_space *mapping, sector_t bno, > return 0; > > bno = 0; > - while ((ret = iomap_iter(&iter, ops)) > 0) { > + while ((ret = iomap_iter(&iter, iomap_next)) > 0) { > if (iter.iomap.type == IOMAP_MAPPED) > bno = iomap_sector(&iter.iomap, iter.pos) >> blkshift; > /* leave iter.status unset to abort loop */ > diff --git a/fs/iomap/iter.c b/fs/iomap/iter.c > index 466c491bdef6..984045af310a 100644 > --- a/fs/iomap/iter.c > +++ b/fs/iomap/iter.c > @@ -42,7 +42,7 @@ static inline void iomap_iter_done(struct iomap_iter *iter) > /** > * iomap_iter - iterate over a ranges in a file > * @iter: iteration structue > - * @ops: iomap ops provided by the file system > + * @iomap_next: iomap_next callback provided by the file system > * > * Iterate over filesystem-provided space mappings for the provided file range. > * > @@ -54,13 +54,13 @@ static inline void iomap_iter_done(struct iomap_iter *iter) > * of the loop body: leave @iter.status unchanged, or set it to a negative > * errno. > */ > -int iomap_iter(struct iomap_iter *iter, const struct iomap_ops *ops) > +int iomap_iter(struct iomap_iter *iter, iomap_next_fn iomap_next) > { > int ret; > > - trace_iomap_iter(iter, ops, _RET_IP_); > + trace_iomap_iter(iter, iomap_next, _RET_IP_); > > - ret = ops->iomap_next(iter, &iter->iomap, &iter->srcmap); > + ret = iomap_next(iter, &iter->iomap, &iter->srcmap); > iter->status = 0; > if (ret > 0) > iomap_iter_done(iter); > diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c > index 6cbc587c93da..1bc5053d3fc1 100644 > --- a/fs/iomap/seek.c > +++ b/fs/iomap/seek.c > @@ -27,7 +27,7 @@ static int iomap_seek_hole_iter(struct iomap_iter *iter, > } > > loff_t > -iomap_seek_hole(struct inode *inode, loff_t pos, const struct iomap_ops *ops) > +iomap_seek_hole(struct inode *inode, loff_t pos, iomap_next_fn iomap_next) > { > loff_t size = i_size_read(inode); > struct iomap_iter iter = { > @@ -42,7 +42,7 @@ iomap_seek_hole(struct inode *inode, loff_t pos, const struct iomap_ops *ops) > return -ENXIO; > > iter.len = size - pos; > - while ((ret = iomap_iter(&iter, ops)) > 0) > + while ((ret = iomap_iter(&iter, iomap_next)) > 0) > iter.status = iomap_seek_hole_iter(&iter, &pos); > if (ret < 0) > return ret; > @@ -73,7 +73,7 @@ static int iomap_seek_data_iter(struct iomap_iter *iter, > } > > loff_t > -iomap_seek_data(struct inode *inode, loff_t pos, const struct iomap_ops *ops) > +iomap_seek_data(struct inode *inode, loff_t pos, iomap_next_fn iomap_next) > { > loff_t size = i_size_read(inode); > struct iomap_iter iter = { > @@ -88,7 +88,7 @@ iomap_seek_data(struct inode *inode, loff_t pos, const struct iomap_ops *ops) > return -ENXIO; > > iter.len = size - pos; > - while ((ret = iomap_iter(&iter, ops)) > 0) > + while ((ret = iomap_iter(&iter, iomap_next)) > 0) > iter.status = iomap_seek_data_iter(&iter, &pos); > if (ret < 0) > return ret; > diff --git a/fs/iomap/swapfile.c b/fs/iomap/swapfile.c > index 0db77c449467..b8bb34deddfc 100644 > --- a/fs/iomap/swapfile.c > +++ b/fs/iomap/swapfile.c > @@ -139,7 +139,7 @@ static int iomap_swapfile_iter(struct iomap_iter *iter, > */ > int iomap_swapfile_activate(struct swap_info_struct *sis, > struct file *swap_file, sector_t *pagespan, > - const struct iomap_ops *ops) > + iomap_next_fn iomap_next) > { > struct inode *inode = swap_file->f_mapping->host; > struct iomap_iter iter = { > @@ -163,7 +163,7 @@ int iomap_swapfile_activate(struct swap_info_struct *sis, > if (ret) > return ret; > > - while ((ret = iomap_iter(&iter, ops)) > 0) > + while ((ret = iomap_iter(&iter, iomap_next)) > 0) > iter.status = iomap_swapfile_iter(&iter, &iter.iomap, &isi); > if (ret < 0) > return ret; > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index 2a0c54256e93..91480cb6a4d8 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -752,7 +752,7 @@ xfs_vm_bmap( > */ > if (xfs_is_cow_inode(ip) || XFS_IS_REALTIME_INODE(ip)) > return 0; > - return iomap_bmap(mapping, block, &xfs_read_iomap_ops); > + return iomap_bmap(mapping, block, xfs_read_iomap_next); > } > > static void > @@ -793,7 +793,7 @@ xfs_vm_read_folio( > struct iomap_read_folio_ctx ctx = { .cur_folio = folio }; > > ctx.ops = xfs_get_iomap_read_ops(folio->mapping); > - iomap_read_folio(&xfs_read_iomap_ops, &ctx, NULL); > + iomap_read_folio(xfs_read_iomap_next, &ctx, NULL); > return 0; > } > > @@ -804,7 +804,7 @@ xfs_vm_readahead( > struct iomap_read_folio_ctx ctx = { .rac = rac }; > > ctx.ops = xfs_get_iomap_read_ops(rac->mapping), > - iomap_readahead(&xfs_read_iomap_ops, &ctx, NULL); > + iomap_readahead(xfs_read_iomap_next, &ctx, NULL); > } > > static int > @@ -850,7 +850,7 @@ xfs_vm_swap_activate( > sis->bdev = xfs_inode_buftarg(ip)->bt_bdev; > > return iomap_swapfile_activate(sis, swap_file, span, > - &xfs_read_iomap_ops); > + xfs_read_iomap_next); > } > > const struct address_space_operations xfs_address_space_operations = { > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c > index 7f8bef1a9954..a987ffbf3c02 100644 > --- a/fs/xfs/xfs_file.c > +++ b/fs/xfs/xfs_file.c > @@ -269,7 +269,7 @@ xfs_file_dio_read( > dio_ops = &xfs_dio_read_bounce_ops; > dio_flags |= IOMAP_DIO_BOUNCE; > } > - ret = iomap_dio_rw(iocb, to, &xfs_read_iomap_ops, dio_ops, dio_flags, > + ret = iomap_dio_rw(iocb, to, xfs_read_iomap_next, dio_ops, dio_flags, > NULL, 0); > xfs_iunlock(ip, XFS_IOLOCK_SHARED); > > @@ -292,7 +292,7 @@ xfs_file_dax_read( > ret = xfs_ilock_iocb(iocb, XFS_IOLOCK_SHARED); > if (ret) > return ret; > - ret = dax_iomap_rw(iocb, to, &xfs_read_iomap_ops); > + ret = dax_iomap_rw(iocb, to, xfs_read_iomap_next); > xfs_iunlock(ip, XFS_IOLOCK_SHARED); > > file_accessed(iocb->ki_filp); > @@ -742,7 +742,7 @@ xfs_file_dio_write_aligned( > struct xfs_inode *ip, > struct kiocb *iocb, > struct iov_iter *from, > - const struct iomap_ops *ops, > + iomap_next_fn iomap_next, > const struct iomap_dio_ops *dops, > struct xfs_zone_alloc_ctx *ac) > { > @@ -777,7 +777,7 @@ xfs_file_dio_write_aligned( > if (mapping_stable_writes(iocb->ki_filp->f_mapping)) > dio_flags |= IOMAP_DIO_BOUNCE; > trace_xfs_file_direct_write(iocb, from); > - ret = iomap_dio_rw(iocb, from, ops, dops, dio_flags, ac, 0); > + ret = iomap_dio_rw(iocb, from, iomap_next, dops, dio_flags, ac, 0); > out_unlock: > xfs_iunlock(ip, iolock); > return ret; > @@ -799,7 +799,7 @@ xfs_file_dio_write_zoned( > if (ret < 0) > return ret; > ret = xfs_file_dio_write_aligned(ip, iocb, from, > - &xfs_zoned_direct_write_iomap_ops, > + xfs_zoned_direct_write_iomap_next, > &xfs_dio_zoned_write_ops, &ac); > xfs_zoned_space_unreserve(ip->i_mount, &ac); > return ret; > @@ -824,16 +824,16 @@ xfs_file_dio_write_atomic( > unsigned int iolock = XFS_IOLOCK_SHARED; > ssize_t ret, ocount = iov_iter_count(from); > unsigned int dio_flags = 0; > - const struct iomap_ops *dops; > + iomap_next_fn dops; > > /* > * HW offload should be faster, so try that first if it is already > * known that the write length is not too large. > */ > if (ocount > xfs_inode_buftarg(ip)->bt_awu_max) > - dops = &xfs_atomic_write_cow_iomap_ops; > + dops = xfs_atomic_write_cow_iomap_next; > else > - dops = &xfs_direct_write_iomap_ops; > + dops = xfs_direct_write_iomap_next; Probably ought to be called iter_fn, or at least something that isn't "dops". > > retry: > ret = xfs_ilock_iocb_for_write(iocb, &iolock); > @@ -862,9 +862,9 @@ xfs_file_dio_write_atomic( > * possible. The REQ_ATOMIC-based method is typically not possible if > * the write spans multiple extents or the disk blocks are misaligned. > */ > - if (ret == -ENOPROTOOPT && dops == &xfs_direct_write_iomap_ops) { > + if (ret == -ENOPROTOOPT && dops == xfs_direct_write_iomap_next) { > xfs_iunlock(ip, iolock); > - dops = &xfs_atomic_write_cow_iomap_ops; > + dops = xfs_atomic_write_cow_iomap_next; > goto retry; > } > > @@ -947,7 +947,7 @@ xfs_file_dio_write_unaligned( > flags |= IOMAP_DIO_BOUNCE; > > trace_xfs_file_direct_write(iocb, from); > - ret = iomap_dio_rw(iocb, from, &xfs_direct_write_iomap_ops, > + ret = iomap_dio_rw(iocb, from, xfs_direct_write_iomap_next, > &xfs_dio_write_ops, flags, NULL, 0); > > /* > @@ -987,7 +987,7 @@ xfs_file_dio_write( > if (iocb->ki_flags & IOCB_ATOMIC) > return xfs_file_dio_write_atomic(ip, iocb, from); > return xfs_file_dio_write_aligned(ip, iocb, from, > - &xfs_direct_write_iomap_ops, &xfs_dio_write_ops, NULL); > + xfs_direct_write_iomap_next, &xfs_dio_write_ops, NULL); > } > > static noinline ssize_t > @@ -1011,7 +1011,7 @@ xfs_file_dax_write( > pos = iocb->ki_pos; > > trace_xfs_file_dax_write(iocb, from); > - ret = dax_iomap_rw(iocb, from, &xfs_dax_write_iomap_ops); > + ret = dax_iomap_rw(iocb, from, xfs_dax_write_iomap_next); > if (ret > 0 && iocb->ki_pos > i_size_read(inode)) { > i_size_write(inode, iocb->ki_pos); > error = xfs_setfilesize(ip, pos, ret); > @@ -1054,7 +1054,7 @@ xfs_file_buffered_write( > > trace_xfs_file_buffered_write(iocb, from); > ret = iomap_file_buffered_write(iocb, from, > - &xfs_buffered_write_iomap_ops, &xfs_iomap_write_ops, > + xfs_buffered_write_iomap_next, &xfs_iomap_write_ops, > NULL); > > /* > @@ -1135,7 +1135,7 @@ xfs_file_buffered_write_zoned( > retry: > trace_xfs_file_buffered_write(iocb, from); > ret = iomap_file_buffered_write(iocb, from, > - &xfs_buffered_write_iomap_ops, &xfs_iomap_write_ops, > + xfs_buffered_write_iomap_next, &xfs_iomap_write_ops, > &ac); > if (ret == -ENOSPC && !cleared_space) { > /* > @@ -1856,10 +1856,10 @@ xfs_file_llseek( > default: > return generic_file_llseek(file, offset, whence); > case SEEK_HOLE: > - offset = iomap_seek_hole(inode, offset, &xfs_seek_iomap_ops); > + offset = iomap_seek_hole(inode, offset, xfs_seek_iomap_next); > break; > case SEEK_DATA: > - offset = iomap_seek_data(inode, offset, &xfs_seek_iomap_ops); > + offset = iomap_seek_data(inode, offset, xfs_seek_iomap_next); > break; > } > > @@ -1883,8 +1883,8 @@ xfs_dax_fault_locked( > } > ret = dax_iomap_fault(vmf, order, &pfn, NULL, > (write_fault && !vmf->cow_page) ? > - &xfs_dax_write_iomap_ops : > - &xfs_read_iomap_ops); > + xfs_dax_write_iomap_next : > + xfs_read_iomap_next); > if (ret & VM_FAULT_NEEDDSYNC) > ret = dax_finish_sync_fault(vmf, order, pfn); > return ret; > @@ -1948,7 +1948,7 @@ __xfs_write_fault( > if (IS_DAX(inode)) > ret = xfs_dax_fault_locked(vmf, order, true); > else > - ret = iomap_page_mkwrite(vmf, &xfs_buffered_write_iomap_ops, > + ret = iomap_page_mkwrite(vmf, xfs_buffered_write_iomap_next, > ac); > xfs_iunlock(ip, lock_mode); > > diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c > index 4fa1a5c985db..71c4bb024f04 100644 > --- a/fs/xfs/xfs_iomap.c > +++ b/fs/xfs/xfs_iomap.c > @@ -1037,7 +1037,7 @@ xfs_direct_write_iomap_begin( > return error; > } > > -static int > +int > xfs_direct_write_iomap_next( > const struct iomap_iter *iter, > struct iomap *iomap, > @@ -1047,10 +1047,6 @@ xfs_direct_write_iomap_next( > NULL); > } > > -const struct iomap_ops xfs_direct_write_iomap_ops = { > - .iomap_next = xfs_direct_write_iomap_next, > -}; > - > #ifdef CONFIG_XFS_RT > /* > * This is really simple. The space has already been reserved before taking the > @@ -1099,7 +1095,7 @@ xfs_zoned_direct_write_iomap_begin( > return 0; > } > > -static int > +int > xfs_zoned_direct_write_iomap_next( > const struct iomap_iter *iter, > struct iomap *iomap, > @@ -1109,9 +1105,6 @@ xfs_zoned_direct_write_iomap_next( > xfs_zoned_direct_write_iomap_begin, NULL); > } > > -const struct iomap_ops xfs_zoned_direct_write_iomap_ops = { > - .iomap_next = xfs_zoned_direct_write_iomap_next, > -}; > #endif /* CONFIG_XFS_RT */ > > #ifdef DEBUG > @@ -1294,7 +1287,7 @@ xfs_atomic_write_cow_iomap_begin( > return error; > } > > -static int > +int > xfs_atomic_write_cow_iomap_next( > const struct iomap_iter *iter, > struct iomap *iomap, > @@ -1304,10 +1297,6 @@ xfs_atomic_write_cow_iomap_next( > xfs_atomic_write_cow_iomap_begin, NULL); > } > > -const struct iomap_ops xfs_atomic_write_cow_iomap_ops = { > - .iomap_next = xfs_atomic_write_cow_iomap_next, > -}; > - > static int > xfs_dax_write_iomap_end( > struct inode *inode, > @@ -1328,7 +1317,7 @@ xfs_dax_write_iomap_end( > return xfs_reflink_end_cow(ip, pos, written); > } > > -static int > +int > xfs_dax_write_iomap_next( > const struct iomap_iter *iter, > struct iomap *iomap, > @@ -1338,10 +1327,6 @@ xfs_dax_write_iomap_next( > xfs_dax_write_iomap_end); > } > > -const struct iomap_ops xfs_dax_write_iomap_ops = { > - .iomap_next = xfs_dax_write_iomap_next, > -}; > - > /* > * Convert a hole to a delayed allocation. > */ > @@ -2207,7 +2192,7 @@ xfs_buffered_write_iomap_end( > return 0; > } > > -static int > +int > xfs_buffered_write_iomap_next( > const struct iomap_iter *iter, > struct iomap *iomap, > @@ -2218,10 +2203,6 @@ xfs_buffered_write_iomap_next( > xfs_buffered_write_iomap_end); > } > > -const struct iomap_ops xfs_buffered_write_iomap_ops = { > - .iomap_next = xfs_buffered_write_iomap_next, > -}; > - > static int > xfs_read_iomap_begin( > struct inode *inode, > @@ -2263,7 +2244,7 @@ xfs_read_iomap_begin( > shared ? IOMAP_F_SHARED : 0, seq); > } > > -static int > +int > xfs_read_iomap_next( > const struct iomap_iter *iter, > struct iomap *iomap, > @@ -2272,10 +2253,6 @@ xfs_read_iomap_next( > return iomap_process(iter, iomap, srcmap, xfs_read_iomap_begin, NULL); > } > > -const struct iomap_ops xfs_read_iomap_ops = { > - .iomap_next = xfs_read_iomap_next, > -}; > - > static int > xfs_seek_iomap_begin( > struct inode *inode, > @@ -2360,7 +2337,7 @@ xfs_seek_iomap_begin( > return error; > } > > -static int > +int > xfs_seek_iomap_next( > const struct iomap_iter *iter, > struct iomap *iomap, > @@ -2369,10 +2346,6 @@ xfs_seek_iomap_next( > return iomap_process(iter, iomap, srcmap, xfs_seek_iomap_begin, NULL); > } > > -const struct iomap_ops xfs_seek_iomap_ops = { > - .iomap_next = xfs_seek_iomap_next, > -}; > - > static int > xfs_xattr_iomap_begin( > struct inode *inode, > @@ -2416,7 +2389,7 @@ xfs_xattr_iomap_begin( > return xfs_bmbt_to_iomap(ip, iomap, &imap, flags, IOMAP_F_XATTR, seq); > } > > -static int > +int > xfs_xattr_iomap_next( > const struct iomap_iter *iter, > struct iomap *iomap, > @@ -2425,10 +2398,6 @@ xfs_xattr_iomap_next( > return iomap_process(iter, iomap, srcmap, xfs_xattr_iomap_begin, NULL); > } > > -const struct iomap_ops xfs_xattr_iomap_ops = { > - .iomap_next = xfs_xattr_iomap_next, > -}; > - > int > xfs_zero_range( > struct xfs_inode *ip, > @@ -2443,9 +2412,9 @@ xfs_zero_range( > > if (IS_DAX(inode)) > return dax_zero_range(inode, pos, len, did_zero, > - &xfs_dax_write_iomap_ops); > + xfs_dax_write_iomap_next); > return iomap_zero_range(inode, pos, len, did_zero, > - &xfs_buffered_write_iomap_ops, &xfs_iomap_write_ops, > + xfs_buffered_write_iomap_next, &xfs_iomap_write_ops, > ac); > } > > @@ -2460,8 +2429,8 @@ xfs_truncate_page( > > if (IS_DAX(inode)) > return dax_truncate_page(inode, pos, did_zero, > - &xfs_dax_write_iomap_ops); > + xfs_dax_write_iomap_next); > return iomap_truncate_page(inode, pos, did_zero, > - &xfs_buffered_write_iomap_ops, &xfs_iomap_write_ops, > + xfs_buffered_write_iomap_next, &xfs_iomap_write_ops, > ac); > } > diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h > index ebcce7d49446..01875d20fb66 100644 > --- a/fs/xfs/xfs_iomap.h > +++ b/fs/xfs/xfs_iomap.h > @@ -49,14 +49,22 @@ xfs_aligned_fsb_count( > return count_fsb; > } > > -extern const struct iomap_ops xfs_buffered_write_iomap_ops; > -extern const struct iomap_ops xfs_direct_write_iomap_ops; > -extern const struct iomap_ops xfs_zoned_direct_write_iomap_ops; > -extern const struct iomap_ops xfs_read_iomap_ops; > -extern const struct iomap_ops xfs_seek_iomap_ops; > -extern const struct iomap_ops xfs_xattr_iomap_ops; > -extern const struct iomap_ops xfs_dax_write_iomap_ops; > -extern const struct iomap_ops xfs_atomic_write_cow_iomap_ops; > +int xfs_buffered_write_iomap_next(const struct iomap_iter *iter, > + struct iomap *iomap, struct iomap *srcmap); > +int xfs_direct_write_iomap_next(const struct iomap_iter *iter, > + struct iomap *iomap, struct iomap *srcmap); > +int xfs_zoned_direct_write_iomap_next(const struct iomap_iter *iter, > + struct iomap *iomap, struct iomap *srcmap); > +int xfs_read_iomap_next(const struct iomap_iter *iter, struct iomap *iomap, > + struct iomap *srcmap); > +int xfs_seek_iomap_next(const struct iomap_iter *iter, struct iomap *iomap, > + struct iomap *srcmap); > +int xfs_xattr_iomap_next(const struct iomap_iter *iter, struct iomap *iomap, > + struct iomap *srcmap); > +int xfs_dax_write_iomap_next(const struct iomap_iter *iter, struct iomap *iomap, > + struct iomap *srcmap); > +int xfs_atomic_write_cow_iomap_next(const struct iomap_iter *iter, > + struct iomap *iomap, struct iomap *srcmap); > extern const struct iomap_write_ops xfs_iomap_write_ops; > > #endif /* __XFS_IOMAP_H__*/ > diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c > index 6339f4956ecb..5c3d9a365f93 100644 > --- a/fs/xfs/xfs_iops.c > +++ b/fs/xfs/xfs_iops.c > @@ -1239,10 +1239,10 @@ xfs_vn_fiemap( > if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) { > fieinfo->fi_flags &= ~FIEMAP_FLAG_XATTR; > error = iomap_fiemap(inode, fieinfo, start, length, > - &xfs_xattr_iomap_ops); > + xfs_xattr_iomap_next); > } else { > error = iomap_fiemap(inode, fieinfo, start, length, > - &xfs_read_iomap_ops); > + xfs_read_iomap_next); > } > xfs_iunlock(XFS_I(inode), XFS_IOLOCK_SHARED); > > diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c > index a5c188b78138..2b9792626bab 100644 > --- a/fs/xfs/xfs_reflink.c > +++ b/fs/xfs/xfs_reflink.c > @@ -1683,7 +1683,7 @@ xfs_reflink_remap_prep( > pos_out, len, remap_flags); > else > ret = dax_remap_file_range_prep(file_in, pos_in, file_out, > - pos_out, len, remap_flags, &xfs_read_iomap_ops); > + pos_out, len, remap_flags, xfs_read_iomap_next); > if (ret || *len == 0) > goto out_unlock; > > @@ -1878,10 +1878,10 @@ xfs_reflink_unshare( > > if (IS_DAX(inode)) > error = dax_file_unshare(inode, offset, len, > - &xfs_dax_write_iomap_ops); > + xfs_dax_write_iomap_next); > else > error = iomap_file_unshare(inode, offset, len, > - &xfs_buffered_write_iomap_ops, > + xfs_buffered_write_iomap_next, > &xfs_iomap_write_ops); > if (error) > goto out; Aside from the name bikeshedding, the logic looks solid. :) --D