From: Carlos Maiolino <cmaiolino@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: hch@infradead.org, linux-xfs@vger.kernel.org,
linux-fsdevel@vger.kernel.org, Damien.LeMoal@wdc.com,
Christoph Hellwig <hch@lst.de>,
agruenba@redhat.com
Subject: Re: [PATCH 3/5] xfs: remove the fork fields in the writepage_ctx and ioend
Date: Mon, 5 Aug 2019 14:54:38 +0200 [thread overview]
Message-ID: <20190805125438.va6qirxxhmr2isa4@orion.maiolino.org> (raw)
In-Reply-To: <156444954007.2682520.7677605159311778499.stgit@magnolia>
On Mon, Jul 29, 2019 at 06:19:00PM -0700, Darrick J. Wong wrote:
> From: Christoph Hellwig <hch@lst.de>
>
> In preparation for moving the writeback code to iomap.c, replace the
> XFS-specific COW fork concept with the iomap IOMAP_F_SHARED flag.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
> ---
> fs/xfs/xfs_aops.c | 42 ++++++++++++++++++++++--------------------
> fs/xfs/xfs_aops.h | 2 +-
> 2 files changed, 23 insertions(+), 21 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> index 12f42922251c..93f1bf315585 100644
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@ -23,7 +23,6 @@
> */
> struct xfs_writepage_ctx {
> struct iomap iomap;
> - int fork;
> unsigned int data_seq;
> unsigned int cow_seq;
> struct xfs_ioend *ioend;
> @@ -269,7 +268,7 @@ xfs_end_ioend(
> */
> error = blk_status_to_errno(ioend->io_bio->bi_status);
> if (unlikely(error)) {
> - if (ioend->io_fork == XFS_COW_FORK)
> + if (ioend->io_flags & IOMAP_F_SHARED)
> xfs_reflink_cancel_cow_range(ip, offset, size, true);
> goto done;
> }
> @@ -277,7 +276,7 @@ xfs_end_ioend(
> /*
> * Success: commit the COW or unwritten blocks if needed.
> */
> - if (ioend->io_fork == XFS_COW_FORK)
> + if (ioend->io_flags & IOMAP_F_SHARED)
> error = xfs_reflink_end_cow(ip, offset, size);
> else if (ioend->io_type == IOMAP_UNWRITTEN)
> error = xfs_iomap_write_unwritten(ip, offset, size, false);
> @@ -301,7 +300,8 @@ xfs_ioend_can_merge(
> {
> if (ioend->io_bio->bi_status != next->io_bio->bi_status)
> return false;
> - if ((ioend->io_fork == XFS_COW_FORK) ^ (next->io_fork == XFS_COW_FORK))
> + if ((ioend->io_flags & IOMAP_F_SHARED) ^
> + (next->io_flags & IOMAP_F_SHARED))
> return false;
> if ((ioend->io_type == IOMAP_UNWRITTEN) ^
> (next->io_type == IOMAP_UNWRITTEN))
> @@ -408,7 +408,7 @@ xfs_end_bio(
> struct xfs_mount *mp = ip->i_mount;
> unsigned long flags;
>
> - if (ioend->io_fork == XFS_COW_FORK ||
> + if ((ioend->io_flags & IOMAP_F_SHARED) ||
> ioend->io_type == IOMAP_UNWRITTEN ||
> ioend->io_private) {
> spin_lock_irqsave(&ip->i_ioend_lock, flags);
> @@ -439,7 +439,7 @@ xfs_imap_valid(
> * covers the offset. Be careful to check this first because the caller
> * can revalidate a COW mapping without updating the data seqno.
> */
> - if (wpc->fork == XFS_COW_FORK)
> + if (wpc->iomap.flags & IOMAP_F_SHARED)
> return true;
>
> /*
> @@ -469,6 +469,7 @@ static int
> xfs_convert_blocks(
> struct xfs_writepage_ctx *wpc,
> struct xfs_inode *ip,
> + int whichfork,
> loff_t offset)
> {
> int error;
> @@ -480,8 +481,8 @@ xfs_convert_blocks(
> * delalloc extent if free space is sufficiently fragmented.
> */
> do {
> - error = xfs_bmapi_convert_delalloc(ip, wpc->fork, offset,
> - &wpc->iomap, wpc->fork == XFS_COW_FORK ?
> + error = xfs_bmapi_convert_delalloc(ip, whichfork, offset,
> + &wpc->iomap, whichfork == XFS_COW_FORK ?
> &wpc->cow_seq : &wpc->data_seq);
> if (error)
> return error;
> @@ -502,6 +503,7 @@ xfs_map_blocks(
> xfs_fileoff_t offset_fsb = XFS_B_TO_FSBT(mp, offset);
> xfs_fileoff_t end_fsb = XFS_B_TO_FSB(mp, offset + count);
> xfs_fileoff_t cow_fsb = NULLFILEOFF;
> + int whichfork = XFS_DATA_FORK;
> struct xfs_bmbt_irec imap;
> struct xfs_iext_cursor icur;
> int retries = 0;
> @@ -550,7 +552,7 @@ xfs_map_blocks(
> wpc->cow_seq = READ_ONCE(ip->i_cowfp->if_seq);
> xfs_iunlock(ip, XFS_ILOCK_SHARED);
>
> - wpc->fork = XFS_COW_FORK;
> + whichfork = XFS_COW_FORK;
> goto allocate_blocks;
> }
>
> @@ -573,8 +575,6 @@ xfs_map_blocks(
> wpc->data_seq = READ_ONCE(ip->i_df.if_seq);
> xfs_iunlock(ip, XFS_ILOCK_SHARED);
>
> - wpc->fork = XFS_DATA_FORK;
> -
> /* landed in a hole or beyond EOF? */
> if (imap.br_startoff > offset_fsb) {
> imap.br_blockcount = imap.br_startoff - offset_fsb;
> @@ -599,10 +599,10 @@ xfs_map_blocks(
> goto allocate_blocks;
>
> xfs_bmbt_to_iomap(ip, &wpc->iomap, &imap, 0);
> - trace_xfs_map_blocks_found(ip, offset, count, wpc->fork, &imap);
> + trace_xfs_map_blocks_found(ip, offset, count, whichfork, &imap);
> return 0;
> allocate_blocks:
> - error = xfs_convert_blocks(wpc, ip, offset);
> + error = xfs_convert_blocks(wpc, ip, whichfork, offset);
> if (error) {
> /*
> * If we failed to find the extent in the COW fork we might have
> @@ -611,7 +611,8 @@ xfs_map_blocks(
> * the former case, but prevent additional retries to avoid
> * looping forever for the latter case.
> */
> - if (error == -EAGAIN && wpc->fork == XFS_COW_FORK && !retries++)
> + if (error == -EAGAIN && (wpc->iomap.flags & IOMAP_F_SHARED) &&
> + !retries++)
> goto retry;
> ASSERT(error != -EAGAIN);
> return error;
> @@ -622,7 +623,7 @@ xfs_map_blocks(
> * original delalloc one. Trim the return extent to the next COW
> * boundary again to force a re-lookup.
> */
> - if (wpc->fork != XFS_COW_FORK && cow_fsb != NULLFILEOFF) {
> + if (!(wpc->iomap.flags & IOMAP_F_SHARED) && cow_fsb != NULLFILEOFF) {
> loff_t cow_offset = XFS_FSB_TO_B(mp, cow_fsb);
>
> if (cow_offset < wpc->iomap.offset + wpc->iomap.length)
> @@ -631,7 +632,7 @@ xfs_map_blocks(
>
> ASSERT(wpc->iomap.offset <= offset);
> ASSERT(wpc->iomap.offset + wpc->iomap.length > offset);
> - trace_xfs_map_blocks_alloc(ip, offset, count, wpc->fork, &imap);
> + trace_xfs_map_blocks_alloc(ip, offset, count, whichfork, &imap);
> return 0;
> }
>
> @@ -665,14 +666,14 @@ xfs_submit_ioend(
> nofs_flag = memalloc_nofs_save();
>
> /* Convert CoW extents to regular */
> - if (!status && ioend->io_fork == XFS_COW_FORK) {
> + if (!status && (ioend->io_flags & IOMAP_F_SHARED)) {
> status = xfs_reflink_convert_cow(XFS_I(ioend->io_inode),
> ioend->io_offset, ioend->io_size);
> }
>
> /* Reserve log space if we might write beyond the on-disk inode size. */
> if (!status &&
> - (ioend->io_fork == XFS_COW_FORK ||
> + ((ioend->io_flags & IOMAP_F_SHARED) ||
> ioend->io_type != IOMAP_UNWRITTEN) &&
> xfs_ioend_is_append(ioend) &&
> !ioend->io_private)
> @@ -719,8 +720,8 @@ xfs_alloc_ioend(
>
> ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
> INIT_LIST_HEAD(&ioend->io_list);
> - ioend->io_fork = wpc->fork;
> ioend->io_type = wpc->iomap.type;
> + ioend->io_flags = wpc->iomap.flags;
> ioend->io_inode = inode;
> ioend->io_size = 0;
> ioend->io_offset = offset;
> @@ -774,7 +775,8 @@ xfs_add_to_ioend(
> bool merged, same_page = false;
>
> if (!wpc->ioend ||
> - wpc->fork != wpc->ioend->io_fork ||
> + (wpc->iomap.flags & IOMAP_F_SHARED) !=
> + (wpc->ioend->io_flags & IOMAP_F_SHARED) ||
> wpc->iomap.type != wpc->ioend->io_type ||
> sector != bio_end_sector(wpc->ioend->io_bio) ||
> offset != wpc->ioend->io_offset + wpc->ioend->io_size) {
> diff --git a/fs/xfs/xfs_aops.h b/fs/xfs/xfs_aops.h
> index 6a45d675dcba..4a0226cdad4f 100644
> --- a/fs/xfs/xfs_aops.h
> +++ b/fs/xfs/xfs_aops.h
> @@ -13,8 +13,8 @@ extern struct bio_set xfs_ioend_bioset;
> */
> struct xfs_ioend {
> struct list_head io_list; /* next ioend in chain */
> - int io_fork; /* inode fork written back */
> u16 io_type;
> + u16 io_flags; /* IOMAP_F_* */
> struct inode *io_inode; /* file being written to */
> size_t io_size; /* size of the extent */
> xfs_off_t io_offset; /* offset in the file */
>
--
Carlos
next prev parent reply other threads:[~2019-08-05 12:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-30 1:18 [PATCH v4 0/5] xfs: use the iomap writeback code Darrick J. Wong
2019-07-30 1:18 ` [PATCH 1/5] xfs: use a struct iomap in xfs_writepage_ctx Darrick J. Wong
2019-08-05 12:38 ` Carlos Maiolino
2019-08-06 5:34 ` Christoph Hellwig
2019-07-30 1:18 ` [PATCH 2/5] xfs: turn io_append_trans into an io_private void pointer Darrick J. Wong
2019-08-05 12:40 ` Carlos Maiolino
2019-07-30 1:19 ` [PATCH 3/5] xfs: remove the fork fields in the writepage_ctx and ioend Darrick J. Wong
2019-08-05 12:54 ` Carlos Maiolino [this message]
2019-07-30 1:19 ` [PATCH 4/5] xfs: convert the xfs writeback code to iomap writeback Darrick J. Wong
2019-08-05 12:52 ` Carlos Maiolino
2019-07-30 1:19 ` [PATCH 5/5] iomap: move struct iomap_page out of iomap.h Darrick J. Wong
2019-08-05 12:53 ` Carlos Maiolino
2019-09-03 12:57 xfs: use the iomap writeback code v2 Christoph Hellwig
2019-09-03 12:57 ` [PATCH 3/5] xfs: remove the fork fields in the writepage_ctx and ioend 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=20190805125438.va6qirxxhmr2isa4@orion.maiolino.org \
--to=cmaiolino@redhat.com \
--cc=Damien.LeMoal@wdc.com \
--cc=agruenba@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=linux-fsdevel@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).