Skip to content

Commit

Permalink
btrfs: use lockdep_assert_held for spinlocks
Browse files Browse the repository at this point in the history
Using lockdep_assert_held is preferred, replace assert_spin_locked.

Signed-off-by: David Sterba <[email protected]>
  • Loading branch information
kdave committed Mar 31, 2018
1 parent 581c176 commit a4666e6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions fs/btrfs/delayed-ref.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ int btrfs_delayed_ref_lock(struct btrfs_trans_handle *trans,
struct btrfs_delayed_ref_root *delayed_refs;

delayed_refs = &trans->transaction->delayed_refs;
assert_spin_locked(&delayed_refs->lock);
lockdep_assert_held(&delayed_refs->lock);
if (mutex_trylock(&head->mutex))
return 0;

Expand All @@ -239,7 +239,7 @@ static inline void drop_delayed_ref(struct btrfs_trans_handle *trans,
struct btrfs_delayed_ref_head *head,
struct btrfs_delayed_ref_node *ref)
{
assert_spin_locked(&head->lock);
lockdep_assert_held(&head->lock);
rb_erase(&ref->ref_node, &head->ref_tree);
RB_CLEAR_NODE(&ref->ref_node);
if (!list_empty(&ref->add_list))
Expand Down Expand Up @@ -307,7 +307,7 @@ void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans,
struct rb_node *node;
u64 seq = 0;

assert_spin_locked(&head->lock);
lockdep_assert_held(&head->lock);

if (RB_EMPTY_ROOT(&head->ref_tree))
return;
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/qgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1484,7 +1484,7 @@ int btrfs_qgroup_trace_extent_nolock(struct btrfs_fs_info *fs_info,
struct btrfs_qgroup_extent_record *entry;
u64 bytenr = record->bytenr;

assert_spin_locked(&delayed_refs->lock);
lockdep_assert_held(&delayed_refs->lock);
trace_btrfs_qgroup_trace_extent(fs_info, record);

while (*p) {
Expand Down

0 comments on commit a4666e6

Please sign in to comment.