From: Liu Bo <bo.liu@linux.alibaba.com>
To: <linux-btrfs@vger.kernel.org>
Subject: [PATCH v3] Btrfs: remove unused check of skip_locking
Date: Tue, 29 May 2018 21:27:06 +0800 [thread overview]
Message-ID: <1527600426-131024-1-git-send-email-bo.liu@linux.alibaba.com> (raw)
In-Reply-To: <1526612424-97061-5-git-send-email-bo.liu@linux.alibaba.com>
The check is superfluous since all of callers who set search_for_commit
also have skip_locking set.
ASSERT() is put in place to ensure skip_locking is set by callers.
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Liu Bo <bo.liu@linux.alibaba.com>
---
v3: Add assertion and comments to ensure skip_locking is not forgot by callers.
v2: Rebase.
fs/btrfs/ctree.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index a2bcfdf85726..9c4f6b919d51 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -2623,8 +2623,11 @@ static struct extent_buffer *btrfs_search_slot_get_root(struct btrfs_root *root,
level = btrfs_header_level(b);
if (p->need_commit_sem)
up_read(&fs_info->commit_root_sem);
- if (!p->skip_locking)
- btrfs_tree_read_lock(b);
+ /*
+ * Ensure that all callers have set skip_locking when
+ * p->search_commit_root = 1.
+ */
+ ASSERT(p->skip_locking == 1);
goto out;
}
--
1.8.3.1
next prev parent reply other threads:[~2018-05-29 13:27 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-18 3:00 [PATCH v2 0/6] btrfs_search_slot cleanups Liu Bo
2018-05-18 3:00 ` [PATCH v2 1/6] Btrfs: remove superfluous free_extent_buffer Liu Bo
2018-05-18 5:15 ` Qu Wenruo
2018-05-18 3:00 ` [PATCH v2 2/6] Btrfs: use more straightforward extent_buffer_uptodate Liu Bo
2018-05-18 5:17 ` Qu Wenruo
2018-05-18 16:00 ` David Sterba
2018-05-18 3:00 ` [PATCH v2 3/6] Btrfs: move get root of btrfs_search_slot to a helper Liu Bo
2018-05-18 5:20 ` Qu Wenruo
2018-05-18 3:00 ` [PATCH v2 4/6] Btrfs: remove unused check of skip_locking Liu Bo
2018-05-18 5:27 ` Qu Wenruo
2018-05-28 14:21 ` David Sterba
2018-05-28 15:33 ` Nikolay Borisov
2018-05-29 13:27 ` Liu Bo [this message]
2018-05-29 14:49 ` [PATCH v3] " David Sterba
2018-05-18 3:00 ` [PATCH v2 5/6] Btrfs: grab write lock directly if write_lock_level is the max level Liu Bo
2018-05-28 14:32 ` David Sterba
2018-05-18 3:00 ` [PATCH v2 6/6] Btrfs: remove always true check in unlock_up Liu Bo
2018-05-18 5:31 ` Qu Wenruo
2018-05-22 11:05 ` [PATCH v2 0/6] btrfs_search_slot cleanups Su Yue
2018-05-22 12:02 ` David Sterba
2018-05-22 12:35 ` Nikolay Borisov
2018-05-23 2:16 ` Su Yue
2018-05-23 12:34 ` David Sterba
2018-05-23 14:11 ` Liu Bo
2018-05-28 14:40 ` David Sterba
2018-05-28 16:17 ` David Sterba
2018-05-29 8:27 ` Liu Bo
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=1527600426-131024-1-git-send-email-bo.liu@linux.alibaba.com \
--to=bo.liu@linux.alibaba.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 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).