From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH 7/8] btrfs: remove the recurse parameter from __btrfs_tree_read_lock
Date: Fri, 6 Nov 2020 16:27:35 -0500 [thread overview]
Message-ID: <64f17b720411228ac68fae00852ea391103aedc5.1604697895.git.josef@toxicpanda.com> (raw)
In-Reply-To: <cover.1604697895.git.josef@toxicpanda.com>
It is completely unused now, remove it.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/locking.c | 6 ++----
fs/btrfs/locking.h | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c
index c8b239376fb4..e6fa53dddbb6 100644
--- a/fs/btrfs/locking.c
+++ b/fs/btrfs/locking.c
@@ -34,13 +34,11 @@
* __btrfs_tree_read_lock: Lock the extent buffer for read.
* @eb: the eb to be locked
* @nest: the nesting level to be used for lockdep
- * @recurse: unused.
*
* This takes the read lock on the extent buffer, using the specified nesting
* level for lockdep purposes.
*/
-void __btrfs_tree_read_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest,
- bool recurse)
+void __btrfs_tree_read_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest)
{
u64 start_ns = 0;
@@ -54,7 +52,7 @@ void __btrfs_tree_read_lock(struct extent_buffer *eb, enum btrfs_lock_nesting ne
void btrfs_tree_read_lock(struct extent_buffer *eb)
{
- __btrfs_tree_read_lock(eb, BTRFS_NESTING_NORMAL, false);
+ __btrfs_tree_read_lock(eb, BTRFS_NESTING_NORMAL);
}
/*
diff --git a/fs/btrfs/locking.h b/fs/btrfs/locking.h
index 91441e31db18..a2e1f1f5c6e3 100644
--- a/fs/btrfs/locking.h
+++ b/fs/btrfs/locking.h
@@ -87,8 +87,7 @@ void __btrfs_tree_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest);
void btrfs_tree_lock(struct extent_buffer *eb);
void btrfs_tree_unlock(struct extent_buffer *eb);
-void __btrfs_tree_read_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest,
- bool recurse);
+void __btrfs_tree_read_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest);
void btrfs_tree_read_lock(struct extent_buffer *eb);
void btrfs_tree_read_unlock(struct extent_buffer *eb);
int btrfs_try_tree_read_lock(struct extent_buffer *eb);
--
2.26.2
next prev parent reply other threads:[~2020-11-06 21:27 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-06 21:27 [PATCH 0/8] Locking cleanups and lockdep fix Josef Bacik
2020-11-06 21:27 ` [PATCH 1/8] btrfs: cleanup the locking in btrfs_next_old_leaf Josef Bacik
2020-11-09 10:06 ` Filipe Manana
2020-11-06 21:27 ` [PATCH 2/8] btrfs: unlock to current level " Josef Bacik
2020-11-09 10:12 ` Filipe Manana
2020-11-06 21:27 ` [PATCH 3/8] btrfs: kill path->recurse Josef Bacik
2020-11-09 10:19 ` Filipe Manana
2020-11-06 21:27 ` [PATCH 4/8] btrfs: remove the recursion handling code in locking.c Josef Bacik
2020-11-09 10:20 ` Filipe Manana
2020-11-11 14:14 ` David Sterba
2020-11-11 14:29 ` David Sterba
2020-11-11 14:43 ` Josef Bacik
2020-11-11 14:59 ` David Sterba
2020-11-06 21:27 ` [PATCH 5/8] btrfs: remove __btrfs_read_lock_root_node Josef Bacik
2020-11-09 10:20 ` Filipe Manana
2020-11-06 21:27 ` [PATCH 6/8] btrfs: use btrfs_tree_read_lock in btrfs_search_slot Josef Bacik
2020-11-09 10:21 ` Filipe Manana
2020-11-06 21:27 ` Josef Bacik [this message]
2020-11-09 10:22 ` [PATCH 7/8] btrfs: remove the recurse parameter from __btrfs_tree_read_lock Filipe Manana
2020-11-06 21:27 ` [PATCH 8/8] btrfs: remove ->recursed from extent_buffer Josef Bacik
2020-11-09 10:23 ` Filipe Manana
2020-11-12 18:18 ` [PATCH 0/8] Locking cleanups and lockdep fix David Sterba
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=64f17b720411228ac68fae00852ea391103aedc5.1604697895.git.josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.