From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
avi@scylladb.com, Dave Chinner <dchinner@redhat.com>,
Brian Foster <bfoster@redhat.com>
Subject: Re: [PATCH 01/11] xfs: factor out a xfs_ilock_iocb helper
Date: Wed, 20 Jan 2021 10:41:59 -0800 [thread overview]
Message-ID: <20210120184159.GC3134581@magnolia> (raw)
In-Reply-To: <20210118193516.2915706-2-hch@lst.de>
On Mon, Jan 18, 2021 at 08:35:06PM +0100, Christoph Hellwig wrote:
> Add a helper to factor out the nowait locking logical for the read/write
> helpers.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Dave Chinner <dchinner@redhat.com>
> Reviewed-by: Brian Foster <bfoster@redhat.com>
Looks pretty straightforward,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/xfs_file.c | 55 +++++++++++++++++++++++++----------------------
> 1 file changed, 29 insertions(+), 26 deletions(-)
>
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index 5b0f93f738372d..c441cddfa4acbc 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -197,6 +197,23 @@ xfs_file_fsync(
> return error;
> }
>
> +static int
> +xfs_ilock_iocb(
> + struct kiocb *iocb,
> + unsigned int lock_mode)
> +{
> + struct xfs_inode *ip = XFS_I(file_inode(iocb->ki_filp));
> +
> + if (iocb->ki_flags & IOCB_NOWAIT) {
> + if (!xfs_ilock_nowait(ip, lock_mode))
> + return -EAGAIN;
> + } else {
> + xfs_ilock(ip, lock_mode);
> + }
> +
> + return 0;
> +}
> +
> STATIC ssize_t
> xfs_file_dio_aio_read(
> struct kiocb *iocb,
> @@ -213,12 +230,9 @@ xfs_file_dio_aio_read(
>
> file_accessed(iocb->ki_filp);
>
> - if (iocb->ki_flags & IOCB_NOWAIT) {
> - if (!xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED))
> - return -EAGAIN;
> - } else {
> - xfs_ilock(ip, XFS_IOLOCK_SHARED);
> - }
> + ret = xfs_ilock_iocb(iocb, XFS_IOLOCK_SHARED);
> + if (ret)
> + return ret;
> ret = iomap_dio_rw(iocb, to, &xfs_read_iomap_ops, NULL,
> is_sync_kiocb(iocb));
> xfs_iunlock(ip, XFS_IOLOCK_SHARED);
> @@ -240,13 +254,9 @@ xfs_file_dax_read(
> if (!count)
> return 0; /* skip atime */
>
> - if (iocb->ki_flags & IOCB_NOWAIT) {
> - if (!xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED))
> - return -EAGAIN;
> - } else {
> - xfs_ilock(ip, XFS_IOLOCK_SHARED);
> - }
> -
> + ret = xfs_ilock_iocb(iocb, XFS_IOLOCK_SHARED);
> + if (ret)
> + return ret;
> ret = dax_iomap_rw(iocb, to, &xfs_read_iomap_ops);
> xfs_iunlock(ip, XFS_IOLOCK_SHARED);
>
> @@ -264,12 +274,9 @@ xfs_file_buffered_aio_read(
>
> trace_xfs_file_buffered_read(ip, iov_iter_count(to), iocb->ki_pos);
>
> - if (iocb->ki_flags & IOCB_NOWAIT) {
> - if (!xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED))
> - return -EAGAIN;
> - } else {
> - xfs_ilock(ip, XFS_IOLOCK_SHARED);
> - }
> + ret = xfs_ilock_iocb(iocb, XFS_IOLOCK_SHARED);
> + if (ret)
> + return ret;
> ret = generic_file_read_iter(iocb, to);
> xfs_iunlock(ip, XFS_IOLOCK_SHARED);
>
> @@ -608,13 +615,9 @@ xfs_file_dax_write(
> size_t count;
> loff_t pos;
>
> - if (iocb->ki_flags & IOCB_NOWAIT) {
> - if (!xfs_ilock_nowait(ip, iolock))
> - return -EAGAIN;
> - } else {
> - xfs_ilock(ip, iolock);
> - }
> -
> + ret = xfs_ilock_iocb(iocb, iolock);
> + if (ret)
> + return ret;
> ret = xfs_file_aio_write_checks(iocb, from, &iolock);
> if (ret)
> goto out;
> --
> 2.29.2
>
next prev parent reply other threads:[~2021-01-20 19:56 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 19:35 reduce sub-block DIO serialisation v2 Christoph Hellwig
2021-01-18 19:35 ` [PATCH 01/11] xfs: factor out a xfs_ilock_iocb helper Christoph Hellwig
2021-01-20 18:41 ` Darrick J. Wong [this message]
2021-01-18 19:35 ` [PATCH 02/11] xfs: make xfs_file_aio_write_checks IOCB_NOWAIT-aware Christoph Hellwig
[not found] ` <CACz=WeeaqMrGM53pJF0C_Wt2JuavTOnOV26-osPviYLUpqUmFw@mail.gmail.com>
2021-01-20 16:28 ` Christoph Hellwig
2021-01-20 18:42 ` Darrick J. Wong
2021-01-18 19:35 ` [PATCH 03/11] xfs: cleanup the read/write helper naming Christoph Hellwig
2021-01-19 15:23 ` Brian Foster
2021-01-20 18:43 ` Darrick J. Wong
2021-01-18 19:35 ` [PATCH 04/11] xfs: remove the buffered I/O fallback assert Christoph Hellwig
2021-01-19 15:23 ` Brian Foster
2021-01-20 18:43 ` Darrick J. Wong
2021-01-18 19:35 ` [PATCH 05/11] xfs: simplify the read/write tracepoints Christoph Hellwig
2021-01-19 15:23 ` Brian Foster
2021-01-20 18:45 ` Darrick J. Wong
2021-01-18 19:35 ` [PATCH 06/11] xfs: improve the reflink_bounce_dio_write tracepoint Christoph Hellwig
2021-01-19 15:23 ` Brian Foster
2021-01-20 18:45 ` Darrick J. Wong
2021-01-18 19:35 ` [PATCH 07/11] xfs: split unaligned DIO write code out Christoph Hellwig
2021-01-19 15:23 ` Brian Foster
2021-01-20 18:46 ` Darrick J. Wong
2021-01-18 19:35 ` [PATCH 08/11] iomap: rename the flags variable in __iomap_dio_rw Christoph Hellwig
2021-01-18 20:34 ` Dave Chinner
2021-01-19 15:23 ` Brian Foster
2021-01-20 18:46 ` Darrick J. Wong
2021-01-18 19:35 ` [PATCH 09/11] iomap: pass a flags argument to iomap_dio_rw Christoph Hellwig
2021-01-19 15:23 ` Brian Foster
2021-01-20 18:17 ` Darrick J. Wong
2021-01-20 18:35 ` Christoph Hellwig
2021-01-18 19:35 ` [PATCH 10/11] iomap: add a IOMAP_DIO_UNALIGNED flag Christoph Hellwig
2021-01-18 20:45 ` Dave Chinner
2021-01-18 21:41 ` Matthew Wilcox
2021-01-20 16:40 ` Christoph Hellwig
2021-01-20 18:47 ` Darrick J. Wong
2021-01-18 19:35 ` [PATCH 11/11] xfs: reduce exclusive locking on unaligned dio Christoph Hellwig
2021-01-18 20:55 ` Dave Chinner
2021-01-20 16:36 ` Christoph Hellwig
2021-01-20 18:40 ` Darrick J. Wong
2021-01-20 18:44 ` Christoph Hellwig
2021-01-20 19:58 ` Darrick J. Wong
2021-01-21 8:58 reduce sub-block DIO serialisation v3 Christoph Hellwig
2021-01-21 8:58 ` [PATCH 01/11] xfs: factor out a xfs_ilock_iocb helper Christoph Hellwig
2021-01-22 16:20 reduce sub-block DIO serialisation v4 Christoph Hellwig
2021-01-22 16:20 ` [PATCH 01/11] xfs: factor out a xfs_ilock_iocb helper 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=20210120184159.GC3134581@magnolia \
--to=djwong@kernel.org \
--cc=avi@scylladb.com \
--cc=bfoster@redhat.com \
--cc=dchinner@redhat.com \
--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).