On Tue 20-07-21 15:33:38, Christoph Hellwig wrote:
> ext2_iomap_ops will be used for the FIEMAP support going forward,
> so make it available unconditionally.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/ext2/inode.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
> index dadb121beb22..3e9a04770f49 100644
> --- a/fs/ext2/inode.c
> +++ b/fs/ext2/inode.c
> @@ -799,7 +799,6 @@ int ext2_get_block(struct inode *inode, sector_t iblock,
>
> }
>
> -#ifdef CONFIG_FS_DAX
> static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
> unsigned flags, struct iomap *iomap, struct iomap *srcmap)
> {
> @@ -852,10 +851,6 @@ const struct iomap_ops ext2_iomap_ops = {
> .iomap_begin = ext2_iomap_begin,
> .iomap_end = ext2_iomap_end,
> };
> -#else
> -/* Define empty ops for !CONFIG_FS_DAX case to avoid ugly ifdefs */
> -const struct iomap_ops ext2_iomap_ops;
> -#endif /* CONFIG_FS_DAX */
>
> int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
> u64 start, u64 len)
> --
> 2.30.2
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
