All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Sterba <dsterba@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: David Sterba <dsterba@suse.com>
Subject: [PATCH 5/5] btrfs: assert bio list lock in merge_rbio
Date: Fri, 31 May 2019 19:01:30 +0200	[thread overview]
Message-ID: <5beec629c35c15acafe50c537491eb50f52b4348.1559321947.git.dsterba@suse.com> (raw)
In-Reply-To: <cover.1559321947.git.dsterba@suse.com>

Turn the comment about required lock into an assertion.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 fs/btrfs/raid56.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index 67a6f7d47402..505979d867e0 100644
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -310,12 +310,12 @@ static void steal_rbio(struct btrfs_raid_bio *src, struct btrfs_raid_bio *dest)
  * merging means we take the bio_list from the victim and
  * splice it into the destination.  The victim should
  * be discarded afterwards.
- *
- * must be called with dest->rbio_list_lock held
  */
 static void merge_rbio(struct btrfs_raid_bio *dest,
 		       struct btrfs_raid_bio *victim)
 {
+	lockdep_assert_held(&dest->bio_list_lock);
+
 	bio_list_merge(&dest->bio_list, &victim->bio_list);
 	dest->bio_list_bytes += victim->bio_list_bytes;
 	dest->generic_bio_cnt += victim->generic_bio_cnt;
-- 
2.21.0


  parent reply	other threads:[~2019-05-31 17:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-31 17:01 [PATCH 0/5] More lockdep annotations David Sterba
2019-05-31 17:01 ` [PATCH 1/5] btrfs: tests: add locks around add_extent_mapping David Sterba
2019-05-31 17:01 ` [PATCH 2/5] btrfs: assert extent map tree lock in add_extent_mapping David Sterba
2019-05-31 17:01 ` [PATCH 3/5] btrfs: assert tree mod log lock in __tree_mod_log_insert David Sterba
2019-05-31 17:01 ` [PATCH 4/5] btrfs: assert delayed ref lock in btrfs_find_delayed_ref_head David Sterba
2019-05-31 17:01 ` David Sterba [this message]
2019-06-05  7:34 ` [PATCH 0/5] More lockdep annotations Nikolay Borisov
2019-06-07 13:31   ` 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=5beec629c35c15acafe50c537491eb50f52b4348.1559321947.git.dsterba@suse.com \
    --to=dsterba@suse.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.