From: "Darrick J. Wong" <djwong@kernel.org>
To: Brian Foster <bfoster@redhat.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 4/4] xfs: drop unnecessary setfilesize helper
Date: Wed, 7 Apr 2021 08:40:04 -0700 [thread overview]
Message-ID: <20210407154004.GK3957620@magnolia> (raw)
In-Reply-To: <20210405145903.629152-5-bfoster@redhat.com>
On Mon, Apr 05, 2021 at 10:59:03AM -0400, Brian Foster wrote:
> xfs_setfilesize() is the only remaining caller of the internal
> __xfs_setfilesize() helper. Fold them into a single function.
>
> Signed-off-by: Brian Foster <bfoster@redhat.com>
LGTM
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/xfs_aops.c | 29 +++++++++--------------------
> 1 file changed, 9 insertions(+), 20 deletions(-)
>
> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> index a7f91f4186bc..87c2912f147d 100644
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@ -42,14 +42,20 @@ static inline bool xfs_ioend_is_append(struct iomap_ioend *ioend)
> /*
> * Update on-disk file size now that data has been written to disk.
> */
> -STATIC int
> -__xfs_setfilesize(
> +int
> +xfs_setfilesize(
> struct xfs_inode *ip,
> - struct xfs_trans *tp,
> xfs_off_t offset,
> size_t size)
> {
> + struct xfs_mount *mp = ip->i_mount;
> + struct xfs_trans *tp;
> xfs_fsize_t isize;
> + int error;
> +
> + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_fsyncts, 0, 0, 0, &tp);
> + if (error)
> + return error;
>
> xfs_ilock(ip, XFS_ILOCK_EXCL);
> isize = xfs_new_eof(ip, offset + size);
> @@ -68,23 +74,6 @@ __xfs_setfilesize(
> return xfs_trans_commit(tp);
> }
>
> -int
> -xfs_setfilesize(
> - struct xfs_inode *ip,
> - xfs_off_t offset,
> - size_t size)
> -{
> - struct xfs_mount *mp = ip->i_mount;
> - struct xfs_trans *tp;
> - int error;
> -
> - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_fsyncts, 0, 0, 0, &tp);
> - if (error)
> - return error;
> -
> - return __xfs_setfilesize(ip, tp, offset, size);
> -}
> -
> /*
> * IO write completion.
> */
> --
> 2.26.3
>
next prev parent reply other threads:[~2021-04-07 15:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-05 14:58 [PATCH 0/4] xfs: ioend batching log reservation deadlock Brian Foster
2021-04-05 14:59 ` [PATCH 1/4] xfs: drop submit side trans alloc for append ioends Brian Foster
2021-04-07 6:33 ` Christoph Hellwig
2021-04-07 11:23 ` Brian Foster
2021-04-07 15:31 ` Darrick J. Wong
2021-04-09 13:47 ` Brian Foster
2021-04-09 16:07 ` Darrick J. Wong
2021-04-05 14:59 ` [PATCH 2/4] xfs: open code ioend needs workqueue helper Brian Foster
2021-04-07 6:34 ` Christoph Hellwig
2021-04-07 11:24 ` Brian Foster
2021-04-07 15:23 ` Darrick J. Wong
2021-04-07 15:42 ` Darrick J. Wong
2021-04-05 14:59 ` [PATCH 3/4] xfs: drop unused ioend private merge and setfilesize code Brian Foster
2021-04-05 17:55 ` Christoph Hellwig
2021-04-05 18:08 ` Brian Foster
2021-04-07 6:36 ` Christoph Hellwig
2021-04-07 15:40 ` Darrick J. Wong
2021-04-05 14:59 ` [PATCH 4/4] xfs: drop unnecessary setfilesize helper Brian Foster
2021-04-07 6:37 ` Christoph Hellwig
2021-04-07 15:40 ` Darrick J. Wong [this message]
2021-04-06 10:27 ` [PATCH 5/4] iomap: remove unused private field from ioend Brian Foster
2021-04-07 6:40 ` Christoph Hellwig
2021-04-07 15:36 ` 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=20210407154004.GK3957620@magnolia \
--to=djwong@kernel.org \
--cc=bfoster@redhat.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 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).