From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 2/2] xfs: rework breaking of shared extents in xfs_file_iomap_begin
Date: Mon, 25 Feb 2019 07:55:08 -0500 [thread overview]
Message-ID: <20190225125508.GB2916@bfoster> (raw)
In-Reply-To: <155104026500.24373.14839198455533713908.stgit@magnolia>
On Sun, Feb 24, 2019 at 12:31:05PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Rework the data flow in xfs_file_iomap_begin where we decide if we have
> to break shared extents.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_iomap.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index a376fb2d4b94..a3043b1bcd9a 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -982,7 +982,7 @@ xfs_file_iomap_begin(
> * been done up front, so we don't need to do them here.
> */
> if (xfs_is_cow_inode(ip)) {
> - struct xfs_bmbt_irec orig = imap;
> + struct xfs_bmbt_irec cmap;
> bool convert_now = (flags & IOMAP_DIRECT);
>
> /* if zeroing doesn't need COW allocation, then we are done. */
> @@ -991,7 +991,8 @@ xfs_file_iomap_begin(
> goto out_found;
>
> /* may drop and re-acquire the ilock */
> - error = xfs_reflink_allocate_cow(ip, &imap, &shared, &lockmode,
> + cmap = imap;
> + error = xfs_reflink_allocate_cow(ip, &cmap, &shared, &lockmode,
> convert_now);
> if (error)
> goto out_unlock;
> @@ -1001,10 +1002,12 @@ xfs_file_iomap_begin(
> * previous block (if there was any) so that the higher level
> * write code can perform read-modify-write operations. For
> * direct I/O code, which must be block aligned we need to
> - * report the newly allocated address.
> + * report the newly allocated address. If the data fork has
> + * a hole, copy the COW fork mapping to avoid allocating to
> + * the data fork.
> */
> - if (!convert_now && orig.br_startblock != HOLESTARTBLOCK)
> - imap = orig;
> + if (convert_now || imap.br_startblock == HOLESTARTBLOCK)
> + imap = cmap;
>
> end_fsb = imap.br_startoff + imap.br_blockcount;
> length = XFS_FSB_TO_B(mp, end_fsb) - offset;
>
next prev parent reply other threads:[~2019-02-25 12:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-24 20:30 [PATCH 1/2] xfs: don't pass iomap flags to xfs_reflink_allocate_cow Darrick J. Wong
2019-02-24 20:31 ` [PATCH 2/2] xfs: rework breaking of shared extents in xfs_file_iomap_begin Darrick J. Wong
2019-02-25 12:55 ` Brian Foster [this message]
2019-02-25 12:55 ` [PATCH 1/2] xfs: don't pass iomap flags to xfs_reflink_allocate_cow Brian Foster
2019-02-25 16:59 ` Darrick J. Wong
2019-02-25 17:18 ` Brian Foster
2019-02-25 17:43 ` Darrick J. Wong
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=20190225125508.GB2916@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.