From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 5/7] xfs: remove the unused trimmed argument from xfs_reflink_trim_around_shared
Date: Mon, 1 Oct 2018 10:26:54 -0400 [thread overview]
Message-ID: <20181001142653.GG53694@bfoster> (raw)
In-Reply-To: <20181001123741.32005-6-hch@lst.de>
On Mon, Oct 01, 2018 at 05:37:39AM -0700, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_bmap_util.c | 4 ++--
> fs/xfs/xfs_iomap.c | 5 ++---
> fs/xfs/xfs_reflink.c | 15 +++++----------
> fs/xfs/xfs_reflink.h | 2 +-
> 4 files changed, 10 insertions(+), 16 deletions(-)
>
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index 6de8d90041ff..8d2579847076 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -406,10 +406,10 @@ xfs_getbmap_report_one(
> struct xfs_bmbt_irec *got)
> {
> struct kgetbmap *p = out + bmv->bmv_entries;
> - bool shared = false, trimmed = false;
> + bool shared = false;
> int error;
>
> - error = xfs_reflink_trim_around_shared(ip, got, &shared, &trimmed);
> + error = xfs_reflink_trim_around_shared(ip, got, &shared);
> if (error)
> return error;
>
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index 8ba97e67b474..1224eced1ee4 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -1026,7 +1026,7 @@ xfs_file_iomap_begin(
> struct xfs_bmbt_irec imap;
> xfs_fileoff_t offset_fsb, end_fsb;
> int nimaps = 1, error = 0;
> - bool shared = false, trimmed = false;
> + bool shared = false;
> unsigned lockmode;
>
> if (XFS_FORCED_SHUTDOWN(mp))
> @@ -1062,8 +1062,7 @@ xfs_file_iomap_begin(
>
> if (flags & IOMAP_REPORT) {
> /* Trim the mapping to the nearest shared extent boundary. */
> - error = xfs_reflink_trim_around_shared(ip, &imap, &shared,
> - &trimmed);
> + error = xfs_reflink_trim_around_shared(ip, &imap, &shared);
> if (error)
> goto out_unlock;
> }
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index 06e38e88ddee..1e39a7d21c7e 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -182,8 +182,7 @@ int
> xfs_reflink_trim_around_shared(
> struct xfs_inode *ip,
> struct xfs_bmbt_irec *irec,
> - bool *shared,
> - bool *trimmed)
> + bool *shared)
> {
> xfs_agnumber_t agno;
> xfs_agblock_t agbno;
> @@ -209,7 +208,7 @@ xfs_reflink_trim_around_shared(
> if (error)
> return error;
>
> - *shared = *trimmed = false;
> + *shared = false;
> if (fbno == NULLAGBLOCK) {
> /* No shared blocks at all. */
> return 0;
> @@ -222,8 +221,6 @@ xfs_reflink_trim_around_shared(
> */
> irec->br_blockcount = flen;
> *shared = true;
> - if (flen != aglen)
> - *trimmed = true;
> return 0;
> } else {
> /*
> @@ -233,7 +230,6 @@ xfs_reflink_trim_around_shared(
> * start of the shared region.
> */
> irec->br_blockcount = fbno - agbno;
> - *trimmed = true;
> return 0;
> }
> }
> @@ -255,7 +251,7 @@ xfs_reflink_reserve_cow(
> struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
> struct xfs_bmbt_irec got;
> int error = 0;
> - bool eof = false, trimmed;
> + bool eof = false;
> struct xfs_iext_cursor icur;
> bool shared;
>
> @@ -277,7 +273,7 @@ xfs_reflink_reserve_cow(
> }
>
> /* Trim the mapping to the nearest shared extent boundary. */
> - error = xfs_reflink_trim_around_shared(ip, imap, &shared, &trimmed);
> + error = xfs_reflink_trim_around_shared(ip, imap, &shared);
> if (error)
> return error;
>
> @@ -366,7 +362,6 @@ xfs_find_trim_cow_extent(
> xfs_filblks_t count_fsb = imap->br_blockcount;
> struct xfs_iext_cursor icur;
> struct xfs_bmbt_irec got;
> - bool trimmed;
>
> *found = false;
>
> @@ -376,7 +371,7 @@ xfs_find_trim_cow_extent(
> */
> if (!xfs_iext_lookup_extent(ip, ip->i_cowfp, offset_fsb, &icur, &got) ||
> got.br_startoff > offset_fsb)
> - return xfs_reflink_trim_around_shared(ip, imap, shared, &trimmed);
> + return xfs_reflink_trim_around_shared(ip, imap, shared);
>
> *shared = true;
> if (isnullstartblock(got.br_startblock)) {
> diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h
> index b77f4079022a..7f47202b5639 100644
> --- a/fs/xfs/xfs_reflink.h
> +++ b/fs/xfs/xfs_reflink.h
> @@ -10,7 +10,7 @@ extern int xfs_reflink_find_shared(struct xfs_mount *mp, struct xfs_trans *tp,
> xfs_agnumber_t agno, xfs_agblock_t agbno, xfs_extlen_t aglen,
> xfs_agblock_t *fbno, xfs_extlen_t *flen, bool find_maximal);
> extern int xfs_reflink_trim_around_shared(struct xfs_inode *ip,
> - struct xfs_bmbt_irec *irec, bool *shared, bool *trimmed);
> + struct xfs_bmbt_irec *irec, bool *shared);
>
> extern int xfs_reflink_reserve_cow(struct xfs_inode *ip,
> struct xfs_bmbt_irec *imap);
> --
> 2.19.0
>
next prev parent reply other threads:[~2018-10-01 21:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-01 12:37 delalloc and reflink fixes & tweaks V2 Christoph Hellwig
2018-10-01 12:37 ` [PATCH 1/7] xfs: remove XFS_IO_INVALID Christoph Hellwig
2018-10-01 14:19 ` Brian Foster
2018-10-01 12:37 ` [PATCH 2/7] xfs: always allocate blocks as unwritten for file data Christoph Hellwig
2018-10-01 14:19 ` Brian Foster
2018-10-01 12:37 ` [PATCH 3/7] xfs: handle zeroing in xfs_file_iomap_begin_delay Christoph Hellwig
2018-10-01 14:20 ` Brian Foster
2018-10-01 14:46 ` Christoph Hellwig
2018-10-01 12:37 ` [PATCH 4/7] xfs: remove the unused shared argument to xfs_reflink_reserve_cow Christoph Hellwig
2018-10-01 14:26 ` Brian Foster
2018-10-01 12:37 ` [PATCH 5/7] xfs: remove the unused trimmed argument from xfs_reflink_trim_around_shared Christoph Hellwig
2018-10-01 14:26 ` Brian Foster [this message]
2018-10-01 12:37 ` [PATCH 6/7] xfs: fix fork selection in xfs_find_trim_cow_extent Christoph Hellwig
2018-10-01 14:27 ` Brian Foster
2018-10-01 12:37 ` [PATCH 7/7] xfs: print dangling delalloc extents Christoph Hellwig
2018-10-01 14:27 ` Brian Foster
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=20181001142653.GG53694@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 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.