public inbox for [email protected]
 help / color / mirror / Atom feed
From: Stefan Roesch <[email protected]>
To: <[email protected]>, <[email protected]>,
	<[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>
Subject: [PATCH v1 07/10] btrfs: make lock_and_cleanup_extent_if_need nowait compatible
Date: Thu, 1 Sep 2022 15:58:46 -0700	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>

This adds the nowait parameter to lock_and_cleanup_extent_if_need(). If
the nowait parameter is specified we try to lock the extent in nowait
mode.

Signed-off-by: Stefan Roesch <[email protected]>
---
 fs/btrfs/file.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index d529f61ac5b9..ef9175efbf99 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1440,7 +1440,7 @@ static noinline int
 lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,
 				size_t num_pages, loff_t pos,
 				size_t write_bytes,
-				u64 *lockstart, u64 *lockend,
+				u64 *lockstart, u64 *lockend, bool nowait,
 				struct extent_state **cached_state)
 {
 	struct btrfs_fs_info *fs_info = inode->root->fs_info;
@@ -1455,8 +1455,20 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,
 	if (start_pos < inode->vfs_inode.i_size) {
 		struct btrfs_ordered_extent *ordered;
 
-		lock_extent_bits(&inode->io_tree, start_pos, last_pos,
+		if (nowait) {
+			if (!try_lock_extent(&inode->io_tree, start_pos, last_pos)) {
+				for (i = 0; i < num_pages; i++) {
+					unlock_page(pages[i]);
+					put_page(pages[i]);
+				}
+
+				return -EWOULDBLOCK;
+			}
+		} else {
+			lock_extent_bits(&inode->io_tree, start_pos, last_pos,
 				cached_state);
+		}
+
 		ordered = btrfs_lookup_ordered_range(inode, start_pos,
 						     last_pos - start_pos + 1);
 		if (ordered &&
@@ -1755,7 +1767,7 @@ 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, &cached_state);
+				&lockend, false, &cached_state);
 		if (extents_locked < 0) {
 			if (extents_locked == -EAGAIN)
 				goto again;
-- 
2.30.2


  parent reply	other threads:[~2022-09-01 22:59 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-01 22:58 [PATCH v1 00/10] io-uring/btrfs: support async buffered writes Stefan Roesch
2022-09-01 22:58 ` [PATCH v1 01/10] btrfs: implement a nowait option for tree searches Stefan Roesch
2022-09-02 14:48   ` Filipe Manana
2022-09-02 14:57     ` Jens Axboe
2022-09-02 15:04       ` Filipe Manana
2022-09-08  0:29         ` Stefan Roesch
2022-09-08  0:28     ` Stefan Roesch
2022-09-01 22:58 ` [PATCH v1 02/10] btrfs: make can_nocow_extent nowait compatible Stefan Roesch
2022-09-01 22:58 ` [PATCH v1 03/10] btrfs: add the ability to use NO_FLUSH for data reservations Stefan Roesch
2022-09-01 22:58 ` [PATCH v1 04/10] btrfs: add btrfs_try_lock_ordered_range Stefan Roesch
2022-09-01 22:58 ` [PATCH v1 05/10] btrfs: make btrfs_check_nocow_lock nowait compatible Stefan Roesch
2022-09-01 22:58 ` [PATCH v1 06/10] btrfs: make prepare_pages " Stefan Roesch
2022-09-01 22:58 ` Stefan Roesch [this message]
2022-09-01 22:58 ` [PATCH v1 08/10] btrfs: btrfs: plumb NOWAIT through the write path Stefan Roesch
2022-09-01 22:58 ` [PATCH v1 09/10] btrfs: make balance_dirty_pages nowait compatible Stefan Roesch
2022-09-02 14:34   ` kernel test robot
2022-09-02 14:43     ` Jens Axboe
2022-09-08  0:26       ` Stefan Roesch
2022-09-01 22:58 ` [PATCH v1 10/10] btrfs: enable nowait async buffered writes Stefan Roesch

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 \
    [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