From: "Darrick J. Wong" <djwong@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v1.1 3/5] xfs: set prealloc flag in xfs_alloc_file_space()
Date: Mon, 31 Jan 2022 09:30:00 -0800 [thread overview]
Message-ID: <20220131173000.GC8313@magnolia> (raw)
In-Reply-To: <20220131070226.GW59729@dread.disaster.area>
On Mon, Jan 31, 2022 at 06:02:26PM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Now that we only call xfs_update_prealloc_flags() from
> xfs_file_fallocate() in the case where we need to set the
> preallocation flag, do this in xfs_alloc_file_space() where we
> already have the inode joined into a transaction and get
> rid of the call to xfs_update_prealloc_flags() from the fallocate
> code.
>
> This also means that we now correctly avoid setting the
> XFS_DIFLAG_PREALLOC flag when xfs_is_always_cow_inode() is true, as
> these inodes will never have preallocated extents.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
Aha, there's the @flags elision.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> V1.1
> - fix whitespace damage
> - remove redundant comments in xfs_alloc_file_space().
>
> fs/xfs/xfs_bmap_util.c | 9 +++------
> fs/xfs/xfs_file.c | 8 --------
> 2 files changed, 3 insertions(+), 14 deletions(-)
>
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index d4a387d3d0ce..eb2e387ba528 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -850,9 +850,6 @@ xfs_alloc_file_space(
> rblocks = 0;
> }
>
> - /*
> - * Allocate and setup the transaction.
> - */
> error = xfs_trans_alloc_inode(ip, &M_RES(mp)->tr_write,
> dblocks, rblocks, false, &tp);
> if (error)
> @@ -869,9 +866,9 @@ xfs_alloc_file_space(
> if (error)
> goto error;
>
> - /*
> - * Complete the transaction
> - */
> + ip->i_diflags |= XFS_DIFLAG_PREALLOC;
> + xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
> +
> error = xfs_trans_commit(tp);
> xfs_iunlock(ip, XFS_ILOCK_EXCL);
> if (error)
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index 223996822d84..ae6f5b15a023 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -908,7 +908,6 @@ xfs_file_fallocate(
> struct inode *inode = file_inode(file);
> struct xfs_inode *ip = XFS_I(inode);
> long error;
> - enum xfs_prealloc_flags flags = 0;
> uint iolock = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL;
> loff_t new_size = 0;
> bool do_file_insert = false;
> @@ -1006,8 +1005,6 @@ xfs_file_fallocate(
> }
> do_file_insert = true;
> } else {
> - flags |= XFS_PREALLOC_SET;
> -
> if (!(mode & FALLOC_FL_KEEP_SIZE) &&
> offset + len > i_size_read(inode)) {
> new_size = offset + len;
> @@ -1057,11 +1054,6 @@ xfs_file_fallocate(
> if (error)
> goto out_unlock;
> }
> -
> - error = xfs_update_prealloc_flags(ip, XFS_PREALLOC_SET);
> - if (error)
> - goto out_unlock;
> -
> }
>
> /* Change file size if needed */
> --
> Dave Chinner
> david@fromorbit.com
next prev parent reply other threads:[~2022-01-31 17:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-30 4:59 [PATCHSET v2 0/3] xfs: fix permission drop and flushing in fallocate Darrick J. Wong
2022-01-30 4:59 ` [PATCH 1/3] xfs: use vfs helper to update file attributes after fallocate Darrick J. Wong
2022-01-30 22:30 ` Dave Chinner
2022-01-30 4:59 ` [PATCH 2/3] xfs: flush log after fallocate for sync mounts and sync inodes Darrick J. Wong
2022-01-30 4:59 ` [PATCH 3/3] xfs: ensure log flush at the end of a synchronous fallocate call Darrick J. Wong
2022-01-30 21:59 ` Dave Chinner
2022-01-31 6:43 ` [PATCH 0/5] xfs: fallocate() vs xfs_update_prealloc_flags() Dave Chinner
2022-01-31 6:43 ` [PATCH 1/5] xfs: remove XFS_PREALLOC_SYNC Dave Chinner
2022-01-31 17:25 ` Darrick J. Wong
2022-01-31 6:43 ` [PATCH 2/5] xfs: fallocate() should call file_modified() Dave Chinner
2022-01-31 17:27 ` Darrick J. Wong
2022-01-31 6:43 ` [PATCH 3/5] xfs: set prealloc flag in xfs_alloc_file_space() Dave Chinner
2022-01-31 7:02 ` [PATCH v1.1 " Dave Chinner
2022-01-31 17:30 ` Darrick J. Wong [this message]
2022-01-31 6:43 ` [PATCH 4/5] xfs: move xfs_update_prealloc_flags() to xfs_pnfs.c Dave Chinner
2022-01-31 17:37 ` Darrick J. Wong
2022-01-31 6:43 ` [PATCH 5/5] xfs: ensure log flush at the end of a synchronous fallocate call Dave Chinner
2022-02-01 16:37 ` 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=20220131173000.GC8313@magnolia \
--to=djwong@kernel.org \
--cc=david@fromorbit.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