From: Christoph Hellwig <hch@lst.de>
To: "Darrick J . Wong" <darrick.wong@oracle.com>
Cc: Damien Le Moal <Damien.LeMoal@wdc.com>,
Andreas Gruenbacher <agruenba@redhat.com>,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 11/12] xfs: set IOMAP_F_NEW more carefully
Date: Mon, 22 Jul 2019 11:50:23 +0200 [thread overview]
Message-ID: <20190722095024.19075-12-hch@lst.de> (raw)
In-Reply-To: <20190722095024.19075-1-hch@lst.de>
Don't set IOMAP_F_NEW if we COW over and existing allocated range, as
these aren't strictly new allocations. This is required to be able to
use IOMAP_F_NEW to zero newly allocated blocks, which is required for
the iomap code to fully support file systems that don't do delayed
allocations or use unwritten extents.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_iomap.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 951350ec025d..d340db666c06 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -707,9 +707,12 @@ xfs_file_iomap_begin_delay(
* Flag newly allocated delalloc blocks with IOMAP_F_NEW so we punch
* them out if the write happens to fail.
*/
- iomap_flags |= IOMAP_F_NEW;
- trace_xfs_iomap_alloc(ip, offset, count, whichfork,
- whichfork == XFS_DATA_FORK ? &imap : &cmap);
+ if (whichfork == XFS_DATA_FORK) {
+ iomap_flags |= IOMAP_F_NEW;
+ trace_xfs_iomap_alloc(ip, offset, count, whichfork, &imap);
+ } else {
+ trace_xfs_iomap_alloc(ip, offset, count, whichfork, &cmap);
+ }
done:
if (whichfork == XFS_COW_FORK) {
if (imap.br_startoff > offset_fsb) {
--
2.20.1
next prev parent reply other threads:[~2019-07-22 9:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-22 9:50 lift the xfs writepage code into iomap v3 Christoph Hellwig
2019-07-22 9:50 ` [PATCH 01/12] list.h: add list_pop and list_pop_entry helpers Christoph Hellwig
2019-07-22 20:12 ` Matthew Wilcox
2019-07-22 9:50 ` [PATCH 02/12] xfs: initialize iomap->flags in xfs_bmbt_to_iomap Christoph Hellwig
2019-07-22 9:50 ` [PATCH 03/12] xfs: use a struct iomap in xfs_writepage_ctx Christoph Hellwig
2019-07-22 9:50 ` [PATCH 04/12] xfs: refactor the ioend merging code Christoph Hellwig
2019-07-22 9:50 ` [PATCH 05/12] xfs: turn io_append_trans into an io_private void pointer Christoph Hellwig
2019-07-22 9:50 ` [PATCH 06/12] xfs: remove the fork fields in the writepage_ctx and ioend Christoph Hellwig
2019-07-22 9:50 ` [PATCH 07/12] iomap: move the xfs writeback code to iomap.c Christoph Hellwig
2019-07-22 9:50 ` [PATCH 08/12] iomap: add tracing for the address space operations Christoph Hellwig
2019-07-22 9:50 ` [PATCH 09/12] iomap: move struct iomap_page out of iomap.h Christoph Hellwig
2019-07-22 9:50 ` [PATCH 10/12] iomap: warn on inline maps in iomap_writepage_map Christoph Hellwig
2019-07-22 9:50 ` Christoph Hellwig [this message]
2019-07-22 9:50 ` [PATCH 12/12] iomap: zero newly allocated mapped blocks Christoph Hellwig
2019-07-22 20:12 ` lift the xfs writepage code into iomap v3 Andreas Gruenbacher
2019-07-26 23:37 ` Darrick J. Wong
2019-07-27 13:33 ` Andreas Gruenbacher
2019-07-29 0:06 ` Darrick J. Wong
2019-07-30 1:17 ` Darrick J. Wong
2019-07-31 6:04 ` Damien Le Moal
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=20190722095024.19075-12-hch@lst.de \
--to=hch@lst.de \
--cc=Damien.LeMoal@wdc.com \
--cc=agruenba@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/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).