From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 06/11] xfs: factor out two helpers from xfs_bmapi_write
Date: Thu, 31 Jan 2019 13:28:29 -0500 [thread overview]
Message-ID: <20190131182828.GH36239@bfoster> (raw)
In-Reply-To: <20190131075524.4769-7-hch@lst.de>
On Thu, Jan 31, 2019 at 08:55:19AM +0100, Christoph Hellwig wrote:
> We want to be able to reuse them for the upcoming dedidcated delalloc
> convert routine.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_bmap.c | 78 ++++++++++++++++++++++------------------
> 1 file changed, 44 insertions(+), 34 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index a0443158a40e..d75f45d9b7d1 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -4194,6 +4194,44 @@ xfs_bmapi_convert_unwritten(
> return 0;
> }
>
> +static inline xfs_extlen_t
> +xfs_bmapi_minleft(
> + struct xfs_trans *tp,
> + struct xfs_inode *ip,
> + int fork)
> +{
> + if (tp && tp->t_firstblock != NULLFSBLOCK)
> + return 0;
> + if (XFS_IFORK_FORMAT(ip, fork) != XFS_DINODE_FMT_BTREE)
> + return 1;
> + return be16_to_cpu(XFS_IFORK_PTR(ip, fork)->if_broot->bb_level) + 1;
> +}
> +
> +/*
> + * Log whatever the flags say, even if error. Otherwise we might miss detecting
> + * a case where the data is changed, there's an error, and it's not logged so we
> + * don't shutdown when we should. Don't bother logging extents/btree changes if
> + * we converted to the other format.
> + */
> +static void
> +xfs_bmapi_finish(
> + struct xfs_bmalloca *bma,
> + int whichfork,
> + int error)
> +{
> + if ((bma->logflags & xfs_ilog_fext(whichfork)) &&
> + XFS_IFORK_FORMAT(bma->ip, whichfork) != XFS_DINODE_FMT_EXTENTS)
> + bma->logflags &= ~xfs_ilog_fext(whichfork);
> + else if ((bma->logflags & xfs_ilog_fbroot(whichfork)) &&
> + XFS_IFORK_FORMAT(bma->ip, whichfork) != XFS_DINODE_FMT_BTREE)
> + bma->logflags &= ~xfs_ilog_fbroot(whichfork);
> +
> + if (bma->logflags)
> + xfs_trans_log_inode(bma->tp, bma->ip, bma->logflags);
> + if (bma->cur)
> + xfs_btree_del_cursor(bma->cur, error);
> +}
> +
> /*
> * Map file blocks to filesystem blocks, and allocate blocks or convert the
> * extent state if necessary. Details behaviour is controlled by the flags
> @@ -4273,15 +4311,6 @@ xfs_bmapi_write(
>
> XFS_STATS_INC(mp, xs_blk_mapw);
>
> - if (!tp || tp->t_firstblock == NULLFSBLOCK) {
> - if (XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE)
> - bma.minleft = be16_to_cpu(ifp->if_broot->bb_level) + 1;
> - else
> - bma.minleft = 1;
> - } else {
> - bma.minleft = 0;
> - }
> -
> if (!(ifp->if_flags & XFS_IFEXTENTS)) {
> error = xfs_iread_extents(tp, ip, whichfork);
> if (error)
> @@ -4296,6 +4325,7 @@ xfs_bmapi_write(
> bma.ip = ip;
> bma.total = total;
> bma.datatype = 0;
> + bma.minleft = xfs_bmapi_minleft(tp, ip, whichfork);
>
> /*
> * The delalloc flag means the caller wants to allocate the entire
> @@ -4434,32 +4464,12 @@ xfs_bmapi_write(
> ASSERT(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE ||
> XFS_IFORK_NEXTENTS(ip, whichfork) >
> XFS_IFORK_MAXEXT(ip, whichfork));
> - error = 0;
> + xfs_bmapi_finish(&bma, whichfork, 0);
> + xfs_bmap_validate_ret(orig_bno, orig_len, orig_flags, orig_mval,
> + orig_nmap, *nmap);
> + return 0;
> error0:
> - /*
> - * Log everything. Do this after conversion, there's no point in
> - * logging the extent records if we've converted to btree format.
> - */
> - if ((bma.logflags & xfs_ilog_fext(whichfork)) &&
> - XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS)
> - bma.logflags &= ~xfs_ilog_fext(whichfork);
> - else if ((bma.logflags & xfs_ilog_fbroot(whichfork)) &&
> - XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE)
> - bma.logflags &= ~xfs_ilog_fbroot(whichfork);
> - /*
> - * Log whatever the flags say, even if error. Otherwise we might miss
> - * detecting a case where the data is changed, there's an error,
> - * and it's not logged so we don't shutdown when we should.
> - */
> - if (bma.logflags)
> - xfs_trans_log_inode(tp, ip, bma.logflags);
> -
> - if (bma.cur) {
> - xfs_btree_del_cursor(bma.cur, error);
> - }
> - if (!error)
> - xfs_bmap_validate_ret(orig_bno, orig_len, orig_flags, orig_mval,
> - orig_nmap, *nmap);
> + xfs_bmapi_finish(&bma, whichfork, error);
> return error;
> }
>
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-01-31 18:28 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 7:55 make delalloc conversion more robust and clear Christoph Hellwig
2019-01-31 7:55 ` [PATCH 01/11] FOLD: improve xfs_bmapi_delalloc Christoph Hellwig
2019-01-31 18:09 ` Brian Foster
2019-02-01 7:23 ` Christoph Hellwig
2019-02-01 7:28 ` Christoph Hellwig
2019-02-01 12:46 ` Brian Foster
2019-02-01 16:08 ` Christoph Hellwig
2019-01-31 7:55 ` [PATCH 02/11] xfs: remove the io_type field from the writeback context and ioend Christoph Hellwig
2019-01-31 18:10 ` Brian Foster
2019-01-31 7:55 ` [PATCH 03/11] xfs: remove the s_maxbytes checks in xfs_map_blocks Christoph Hellwig
2019-01-31 18:10 ` Brian Foster
2019-01-31 7:55 ` [PATCH 04/11] xfs: don't try to map blocks beyond i_size in writeback Christoph Hellwig
2019-01-31 18:11 ` Brian Foster
2019-02-01 7:25 ` Christoph Hellwig
2019-02-01 12:46 ` Brian Foster
2019-02-01 16:07 ` Christoph Hellwig
2019-01-31 7:55 ` [PATCH 05/11] xfs: simplify the xfs_bmap_btree_to_extents calling conventions Christoph Hellwig
2019-01-31 18:11 ` Brian Foster
2019-01-31 7:55 ` [PATCH 06/11] xfs: factor out two helpers from xfs_bmapi_write Christoph Hellwig
2019-01-31 18:28 ` Brian Foster [this message]
2019-01-31 7:55 ` [PATCH 07/11] xfs: split XFS_BMAPI_DELALLOC handling " Christoph Hellwig
2019-01-31 19:28 ` Brian Foster
2019-01-31 7:55 ` [PATCH 08/11] xfs: move transaction handling to xfs_bmapi_convert_delalloc Christoph Hellwig
2019-01-31 19:28 ` Brian Foster
2019-01-31 7:55 ` [PATCH 09/11] xfs: move stat accounting " Christoph Hellwig
2019-01-31 19:29 ` Brian Foster
2019-01-31 7:55 ` [PATCH 10/11] xfs: move xfs_iomap_write_allocate to xfs_aops.c Christoph Hellwig
2019-01-31 19:31 ` Brian Foster
2019-01-31 7:55 ` [PATCH 11/11] xfs: retry COW fork delalloc conversion when no extent was found 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=20190131182828.GH36239@bfoster \
--to=bfoster@redhat.com \
--cc=hch@lst.de \
--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).