public inbox for [email protected]
 help / color / mirror / Atom feed
From: Filipe Manana <[email protected]>
To: Stefan Roesch <[email protected]>
Cc: [email protected], [email protected],
	[email protected], [email protected],
	[email protected]
Subject: Re: [PATCH v2 09/12] btrfs: btrfs: plumb NOWAIT through the write path
Date: Thu, 8 Sep 2022 11:16:58 +0100	[thread overview]
Message-ID: <CAL3q7H5Pij0A5G9vEFHKrgUSQuhUA8U6Eh9oAhKRcjeex19U=Q@mail.gmail.com> (raw)
In-Reply-To: <[email protected]>

On Thu, Sep 8, 2022 at 1:26 AM Stefan Roesch <[email protected]> wrote:
>
> We have everywhere setup for nowait, plumb NOWAIT through the write path.

Note, there's a double "btrfs: " prefix in the subject line.

>
> Signed-off-by: Josef Bacik <[email protected]>
> Signed-off-by: Stefan Roesch <[email protected]>
> ---
>  fs/btrfs/file.c | 19 +++++++++++++------
>  1 file changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
> index 4e1745e585cb..6e191e353b22 100644
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@ -1653,8 +1653,9 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,
>         bool force_page_uptodate = false;
>         loff_t old_isize = i_size_read(inode);
>         unsigned int ilock_flags = 0;
> +       bool nowait = iocb->ki_flags & IOCB_NOWAIT;

Can be made const.

Thanks.

>
> -       if (iocb->ki_flags & IOCB_NOWAIT)
> +       if (nowait)
>                 ilock_flags |= BTRFS_ILOCK_TRY;
>
>         ret = btrfs_inode_lock(inode, ilock_flags);
> @@ -1710,17 +1711,22 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,
>                 extent_changeset_release(data_reserved);
>                 ret = btrfs_check_data_free_space(BTRFS_I(inode),
>                                                   &data_reserved, pos,
> -                                                 write_bytes, false);
> +                                                 write_bytes, nowait);
>                 if (ret < 0) {
>                         int tmp;
>
> +                       if (nowait && (ret == -ENOSPC || ret == -EAGAIN)) {
> +                               ret = -EAGAIN;
> +                               break;
> +                       }
> +
>                         /*
>                          * If we don't have to COW at the offset, reserve
>                          * metadata only. write_bytes may get smaller than
>                          * requested here.
>                          */
>                         tmp = btrfs_check_nocow_lock(BTRFS_I(inode), pos,
> -                                                    &write_bytes, false);
> +                                                    &write_bytes, nowait);
>                         if (tmp < 0)
>                                 ret = tmp;
>                         if (tmp > 0)
> @@ -1737,7 +1743,7 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,
>                 WARN_ON(reserve_bytes == 0);
>                 ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode),
>                                                       reserve_bytes,
> -                                                     reserve_bytes, false);
> +                                                     reserve_bytes, nowait);
>                 if (ret) {
>                         if (!only_release_metadata)
>                                 btrfs_free_reserved_data_space(BTRFS_I(inode),
> @@ -1767,10 +1773,11 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,
>                 extents_locked = lock_and_cleanup_extent_if_need(
>                                 BTRFS_I(inode), pages,
>                                 num_pages, pos, write_bytes, &lockstart,
> -                               &lockend, false, &cached_state);
> +                               &lockend, nowait, &cached_state);
>                 if (extents_locked < 0) {
> -                       if (extents_locked == -EAGAIN)
> +                       if (!nowait && extents_locked == -EAGAIN)
>                                 goto again;
> +
>                         btrfs_delalloc_release_extents(BTRFS_I(inode),
>                                                        reserve_bytes);
>                         ret = extents_locked;
> --
> 2.30.2
>

  reply	other threads:[~2022-09-08 10:17 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-08  0:26 [PATCH v2 00/12] io-uring/btrfs: support async buffered writes Stefan Roesch
2022-09-08  0:26 ` [PATCH v2 01/12] mm: export balance_dirty_pages_ratelimited_flags() Stefan Roesch
2022-09-08 10:18   ` Filipe Manana
2022-09-08  0:26 ` [PATCH v2 02/12] btrfs: implement a nowait option for tree searches Stefan Roesch
2022-09-08 13:19   ` Josef Bacik
2022-09-08 18:05     ` Stefan Roesch
2022-09-08  0:26 ` [PATCH v2 03/12] btrfs: make can_nocow_extent nowait compatible Stefan Roesch
2022-09-08  0:26 ` [PATCH v2 04/12] btrfs: add the ability to use NO_FLUSH for data reservations Stefan Roesch
2022-09-08  0:26 ` [PATCH v2 05/12] btrfs: add btrfs_try_lock_ordered_range Stefan Roesch
2022-09-08 10:18   ` Filipe Manana
2022-09-08 18:12     ` Stefan Roesch
2022-09-08  0:26 ` [PATCH v2 06/12] btrfs: make btrfs_check_nocow_lock nowait compatible Stefan Roesch
2022-09-08 10:18   ` Filipe Manana
2022-09-08 18:23     ` Stefan Roesch
2022-09-08  0:26 ` [PATCH v2 07/12] btrfs: make prepare_pages " Stefan Roesch
2022-09-08 10:17   ` Filipe Manana
2022-09-08 18:33     ` Stefan Roesch
2022-09-08  0:26 ` [PATCH v2 08/12] btrfs: make lock_and_cleanup_extent_if_need " Stefan Roesch
2022-09-08 10:17   ` Filipe Manana
2022-09-08 18:38     ` Stefan Roesch
2022-09-08  0:26 ` [PATCH v2 09/12] btrfs: btrfs: plumb NOWAIT through the write path Stefan Roesch
2022-09-08 10:16   ` Filipe Manana [this message]
2022-09-08 18:44     ` Stefan Roesch
2022-09-08  0:26 ` [PATCH v2 10/12] btrfs: make balance_dirty_pages nowait compatible Stefan Roesch
2022-09-08 10:16   ` Filipe Manana
2022-09-08 18:48     ` Stefan Roesch
2022-09-08  0:26 ` [PATCH v2 11/12] btrfs: add assert to search functions Stefan Roesch
2022-09-08 10:15   ` Filipe Manana
2022-09-08 19:10     ` Stefan Roesch
2022-09-08  0:26 ` [PATCH v2 12/12] btrfs: enable nowait async buffered writes Stefan Roesch
2022-09-08 10:14   ` Filipe Manana
2022-09-08 19:14     ` Stefan Roesch
2022-09-08 10:14 ` [PATCH v2 00/12] io-uring/btrfs: support " Filipe Manana

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='CAL3q7H5Pij0A5G9vEFHKrgUSQuhUA8U6Eh9oAhKRcjeex19U=Q@mail.gmail.com' \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    /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