From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Goldwyn Rodrigues <rgoldwyn@suse.com>,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 17/19] xfs: rename the whichfork variable in xfs_buffered_write_iomap_begin
Date: Wed, 18 Sep 2019 11:00:58 -0700 [thread overview]
Message-ID: <20190918180058.GJ2229799@magnolia> (raw)
In-Reply-To: <20190909182722.16783-18-hch@lst.de>
On Mon, Sep 09, 2019 at 08:27:20PM +0200, Christoph Hellwig wrote:
> Renaming whichfork to allocfork in xfs_buffered_write_iomap_begin makes
> the usage of this variable a little more clear.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_iomap.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index 6dd143374d75..0e575ca1e3fc 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -862,7 +862,7 @@ xfs_buffered_write_iomap_begin(
> struct xfs_iext_cursor icur, ccur;
> xfs_fsblock_t prealloc_blocks = 0;
> bool eof = false, cow_eof = false, shared = false;
> - int whichfork = XFS_DATA_FORK;
> + int allocfork = XFS_DATA_FORK;
> int error = 0;
>
> /* we can't use delayed allocations when using extent size hints */
> @@ -959,7 +959,7 @@ xfs_buffered_write_iomap_begin(
> * Fork all the shared blocks from our write offset until the
> * end of the extent.
> */
> - whichfork = XFS_COW_FORK;
> + allocfork = XFS_COW_FORK;
> end_fsb = imap.br_startoff + imap.br_blockcount;
> } else {
> /*
> @@ -975,7 +975,7 @@ xfs_buffered_write_iomap_begin(
> end_fsb = xfs_iomap_end_fsb(mp, offset, count);
>
> if (xfs_is_always_cow_inode(ip))
> - whichfork = XFS_COW_FORK;
> + allocfork = XFS_COW_FORK;
> }
>
> error = xfs_qm_dqattach_locked(ip, false);
> @@ -983,7 +983,7 @@ xfs_buffered_write_iomap_begin(
> goto out_unlock;
>
> if (eof) {
> - prealloc_blocks = xfs_iomap_prealloc_size(ip, whichfork, offset,
> + prealloc_blocks = xfs_iomap_prealloc_size(ip, allocfork, offset,
> count, &icur);
> if (prealloc_blocks) {
> xfs_extlen_t align;
> @@ -1006,11 +1006,11 @@ xfs_buffered_write_iomap_begin(
> }
>
> retry:
> - error = xfs_bmapi_reserve_delalloc(ip, whichfork, offset_fsb,
> + error = xfs_bmapi_reserve_delalloc(ip, allocfork, offset_fsb,
> end_fsb - offset_fsb, prealloc_blocks,
> - whichfork == XFS_DATA_FORK ? &imap : &cmap,
> - whichfork == XFS_DATA_FORK ? &icur : &ccur,
> - whichfork == XFS_DATA_FORK ? eof : cow_eof);
> + allocfork == XFS_DATA_FORK ? &imap : &cmap,
> + allocfork == XFS_DATA_FORK ? &icur : &ccur,
> + allocfork == XFS_DATA_FORK ? eof : cow_eof);
> switch (error) {
> case 0:
> break;
> @@ -1027,8 +1027,8 @@ xfs_buffered_write_iomap_begin(
> goto out_unlock;
> }
>
> - if (whichfork == XFS_COW_FORK) {
> - trace_xfs_iomap_alloc(ip, offset, count, whichfork, &cmap);
> + if (allocfork == XFS_COW_FORK) {
> + trace_xfs_iomap_alloc(ip, offset, count, allocfork, &cmap);
> goto found_cow;
> }
>
> @@ -1037,7 +1037,7 @@ xfs_buffered_write_iomap_begin(
> * them out if the write happens to fail.
> */
> xfs_iunlock(ip, XFS_ILOCK_EXCL);
> - trace_xfs_iomap_alloc(ip, offset, count, whichfork, &imap);
> + trace_xfs_iomap_alloc(ip, offset, count, allocfork, &imap);
> return xfs_bmbt_to_iomap(ip, iomap, &imap, IOMAP_F_NEW);
>
> found_imap:
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-09-18 18:01 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-09 18:27 iomap and xfs COW cleanups Christoph Hellwig
2019-09-09 18:27 ` [PATCH 01/19] iomap: better document the IOMAP_F_* flags Christoph Hellwig
2019-09-14 0:42 ` Allison Collins
2019-09-16 18:08 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 02/19] iomap: remove the unused iomap argument to __iomap_write_end Christoph Hellwig
2019-09-14 0:42 ` Allison Collins
2019-09-16 18:10 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 03/19] iomap: always use AOP_FLAG_NOFS in iomap_write_begin Christoph Hellwig
2019-09-16 18:11 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 04/19] iomap: ignore non-shared or non-data blocks in xfs_file_dirty Christoph Hellwig
2019-09-16 18:12 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 05/19] iomap: move the zeroing case out of iomap_read_page_sync Christoph Hellwig
2019-09-16 18:17 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 06/19] iomap: use write_begin to read pages to unshare Christoph Hellwig
2019-09-16 18:34 ` Darrick J. Wong
2019-09-30 11:07 ` Christoph Hellwig
2019-10-08 15:12 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 07/19] iomap: use a srcmap for a read-modify-write I/O Christoph Hellwig
2019-09-10 12:48 ` Goldwyn Rodrigues
2019-09-10 14:39 ` hch
2019-09-16 17:57 ` Darrick J. Wong
2019-09-16 18:42 ` Darrick J. Wong
2019-09-18 18:15 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 08/19] xfs: also call xfs_file_iomap_end_delalloc for zeroing operations Christoph Hellwig
2019-09-18 17:09 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 09/19] xfs: remove xfs_reflink_dirty_extents Christoph Hellwig
2019-09-18 17:17 ` Darrick J. Wong
2019-09-18 17:25 ` Christoph Hellwig
2019-09-18 17:31 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 10/19] xfs: pass two imaps to xfs_reflink_allocate_cow Christoph Hellwig
2019-09-18 17:26 ` Darrick J. Wong
2019-09-30 11:10 ` Christoph Hellwig
2019-09-09 18:27 ` [PATCH 11/19] xfs: refactor xfs_file_iomap_begin_delay Christoph Hellwig
2019-09-18 17:30 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 12/19] xfs: fill out the srcmap in iomap_begin Christoph Hellwig
2019-09-18 17:52 ` Darrick J. Wong
2019-10-01 6:26 ` Christoph Hellwig
2019-09-09 18:27 ` [PATCH 13/19] xfs: factor out a helper to calculate the end_fsb Christoph Hellwig
2019-09-14 0:42 ` Allison Collins
2019-09-18 17:55 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 14/19] xfs: split out a new set of read-only iomap ops Christoph Hellwig
2019-09-18 17:56 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 15/19] xfs: move xfs_file_iomap_begin_delay around Christoph Hellwig
2019-09-18 17:59 ` Darrick J. Wong
2019-09-30 11:14 ` Christoph Hellwig
2019-09-09 18:27 ` [PATCH 16/19] xfs: split the iomap ops for buffered vs direct writes Christoph Hellwig
2019-09-18 18:00 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 17/19] xfs: rename the whichfork variable in xfs_buffered_write_iomap_begin Christoph Hellwig
2019-09-14 0:42 ` Allison Collins
2019-09-18 18:00 ` Darrick J. Wong [this message]
2019-09-09 18:27 ` [PATCH 18/19] xfs: cleanup xfs_iomap_write_unwritten Christoph Hellwig
2019-09-18 18:06 ` Darrick J. Wong
2019-09-09 18:27 ` [PATCH 19/19] xfs: improve the IOMAP_NOWAIT check for COW inodes Christoph Hellwig
2019-09-18 18:09 ` 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=20190918180058.GJ2229799@magnolia \
--to=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=rgoldwyn@suse.com \
/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).