btrfs: use lockdep_assert_held for spinlocks

Using lockdep_assert_held is preferred, replace assert_spin_locked.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 03bdf355107abe2b191cecd5e4544cdaafe2473a..2677257c149dcf1f2e5419ba486b0b2b760ec42c 100644 (file)
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -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;
        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;
 
        if (mutex_trylock(&head->mutex))
                return 0;
 


@@ -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)
 {
                                    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))
        rb_erase(&ref->ref_node, &head->ref_tree);
        RB_CLEAR_NODE(&ref->ref_node);
        if (!list_empty(&ref->add_list))


@@ -307,7 +307,7 @@ void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans,
        struct rb_node *node;
        u64 seq = 0;
 
        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;
 
        if (RB_EMPTY_ROOT(&head->ref_tree))
                return;

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 875df02ffaeeca47e5504abcf4d6180013289e7d..f583f13ff26e9cbf67a57adeb86016950e8714d4 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -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;
 
        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) {
        trace_btrfs_qgroup_trace_extent(fs_info, record);
 
        while (*p) {