From: Christoph Hellwig <hch@lst.de>
To: Jan Kara <jack@suse.com>,
Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Cc: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 1/4] ext2: make ext2_iomap_ops available unconditionally
Date: Tue, 20 Jul 2021 15:33:38 +0200 [thread overview]
Message-ID: <20210720133341.405438-2-hch@lst.de> (raw)
In-Reply-To: <20210720133341.405438-1-hch@lst.de>
ext2_iomap_ops will be used for the FIEMAP support going forward,
so make it available unconditionally.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
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
next prev parent reply other threads:[~2021-07-20 13:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 13:33 remove generic_block_fiemap Christoph Hellwig
2021-07-20 13:33 ` Christoph Hellwig [this message]
2021-07-26 13:33 ` [PATCH 1/4] ext2: make ext2_iomap_ops available unconditionally Jan Kara
2021-07-20 13:33 ` [PATCH 2/4] ext2: use iomap_fiemap to implement ->fiemap Christoph Hellwig
2021-07-26 13:41 ` Jan Kara
2021-07-20 13:33 ` [PATCH 3/4] hpfs: " Christoph Hellwig
2021-07-20 13:33 ` [PATCH 4/4] fs: remove generic_block_fiemap Christoph Hellwig
2021-07-26 13:52 ` Jan Kara
2021-07-26 13:54 ` Christoph Hellwig
2021-07-26 16:17 ` Jan Kara
2021-07-20 17:02 ` Mikulas Patocka
2021-07-21 5:37 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210720133341.405438-2-hch@lst.de \
--to=hch@lst.de \
--cc=jack@suse.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=mikulas@artax.karlin.mff.cuni.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).