summaryrefslogtreecommitdiffstats
path: root/fs/ext2
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-07-20 15:33:38 +0200
committerJan Kara <jack@suse.cz>2021-07-26 18:08:08 +0200
commit9583db2332e3426129612e0ef69f70fbadb6053b (patch)
tree29585b977612b197fa859d48ba321350b0a586f8 /fs/ext2
parentff1176468d368232b684f75e82563369208bc371 (diff)
downloadlinux-stable-9583db2332e3426129612e0ef69f70fbadb6053b.tar.gz
linux-stable-9583db2332e3426129612e0ef69f70fbadb6053b.tar.bz2
linux-stable-9583db2332e3426129612e0ef69f70fbadb6053b.zip
ext2: make ext2_iomap_ops available unconditionally
ext2_iomap_ops will be used for the FIEMAP support going forward, so make it available unconditionally. Link: https://lore.kernel.org/r/20210720133341.405438-2-hch@lst.de Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext2')
-rw-r--r--fs/ext2/inode.c5
1 files changed, 0 insertions, 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)