On Wed, Sep 15, 2021 at 06:44:57PM +0800, Shiyang Ruan wrote: > Let dax_iomap_zero() support iter model. > > Signed-off-by: Shiyang Ruan <ruansy.f...@fujitsu.com>
Oops, I guess we forgot this one when we did the iter conversion last cycle. :( Reviewed-by: Darrick J. Wong <djw...@kernel.org> --D > --- > fs/dax.c | 3 ++- > fs/iomap/buffered-io.c | 3 +-- > include/linux/dax.h | 3 ++- > 3 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/fs/dax.c b/fs/dax.c > index 41c93929f20b..4f346e25e488 100644 > --- a/fs/dax.c > +++ b/fs/dax.c > @@ -1209,8 +1209,9 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state > *xas, struct vm_fault *vmf, > } > #endif /* CONFIG_FS_DAX_PMD */ > > -s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap) > +s64 dax_iomap_zero(struct iomap_iter *iter, loff_t pos, u64 length) > { > + const struct iomap *iomap = &iter->iomap; > sector_t sector = iomap_sector(iomap, pos & PAGE_MASK); > pgoff_t pgoff; > long rc, id; > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 9cc5798423d1..84a861d3b3e0 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -889,7 +889,6 @@ static s64 __iomap_zero_iter(struct iomap_iter *iter, > loff_t pos, u64 length) > > static loff_t iomap_zero_iter(struct iomap_iter *iter, bool *did_zero) > { > - struct iomap *iomap = &iter->iomap; > const struct iomap *srcmap = iomap_iter_srcmap(iter); > loff_t pos = iter->pos; > loff_t length = iomap_length(iter); > @@ -903,7 +902,7 @@ static loff_t iomap_zero_iter(struct iomap_iter *iter, > bool *did_zero) > s64 bytes; > > if (IS_DAX(iter->inode)) > - bytes = dax_iomap_zero(pos, length, iomap); > + bytes = dax_iomap_zero(iter, pos, length); > else > bytes = __iomap_zero_iter(iter, pos, length); > if (bytes < 0) > diff --git a/include/linux/dax.h b/include/linux/dax.h > index 2619d94c308d..642de7ef1a10 100644 > --- a/include/linux/dax.h > +++ b/include/linux/dax.h > @@ -13,6 +13,7 @@ typedef unsigned long dax_entry_t; > > struct iomap_ops; > struct iomap; > +struct iomap_iter; > struct dax_device; > struct dax_operations { > /* > @@ -210,7 +211,7 @@ vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf, > int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index); > int dax_invalidate_mapping_entry_sync(struct address_space *mapping, > pgoff_t index); > -s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap); > +s64 dax_iomap_zero(struct iomap_iter *iter, loff_t pos, u64 length); > static inline bool dax_mapping(struct address_space *mapping) > { > return mapping->host && IS_DAX(mapping->host); > -- > 2.33.0 > > >