btrfs: use assertion helpers for spinning writers

Use the helpers where open coded. On non-debug builds, the warnings will
not trigger and extent_buffer::spining_writers become unused and can be
moved to the appropriate section, saving a few bytes.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: David Sterba <dsterba@suse.com>

1 files changed, 6 insertions, 10 deletions

diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c
index 13ef1decdea6..a5a3c5118f61 100644
--- a/fs/btrfs/locking.c
+++ b/fs/btrfs/locking.c
@@ -64,8 +64,7 @@ void btrfs_set_lock_blocking_write(struct extent_buffer *eb)
         if (eb->lock_nested && current->pid == eb->lock_owner)
                 return;
         if (atomic_read(&eb->blocking_writers) == 0) {
-                WARN_ON(atomic_read(&eb->spinning_writers) != 1);
-                atomic_dec(&eb->spinning_writers);
+                btrfs_assert_spinning_writers_put(eb);
                 btrfs_assert_tree_locked(eb);
                 atomic_inc(&eb->blocking_writers);
                 write_unlock(&eb->lock);
@@ -101,8 +100,7 @@ void btrfs_clear_lock_blocking_write(struct extent_buffer *eb)
                 return;
         BUG_ON(atomic_read(&eb->blocking_writers) != 1);
         write_lock(&eb->lock);
-        WARN_ON(atomic_read(&eb->spinning_writers));
-        atomic_inc(&eb->spinning_writers);
+        btrfs_assert_spinning_writers_get(eb);
         /* atomic_dec_and_test implies a barrier */
         if (atomic_dec_and_test(&eb->blocking_writers))
                 cond_wake_up_nomb(&eb->write_lock_wq);
@@ -200,7 +198,7 @@ int btrfs_try_tree_write_lock(struct extent_buffer *eb)
                 return 0;
         }
         atomic_inc(&eb->write_locks);
-        atomic_inc(&eb->spinning_writers);
+        btrfs_assert_spinning_writers_get(eb);
         eb->lock_owner = current->pid;
         return 1;
 }
@@ -266,8 +264,7 @@ again:
                 write_unlock(&eb->lock);
                 goto again;
         }
-        WARN_ON(atomic_read(&eb->spinning_writers));
-        atomic_inc(&eb->spinning_writers);
+        btrfs_assert_spinning_writers_get(eb);
         atomic_inc(&eb->write_locks);
         eb->lock_owner = current->pid;
 }
@@ -286,14 +283,13 @@ void btrfs_tree_unlock(struct extent_buffer *eb)
         atomic_dec(&eb->write_locks);
 
         if (blockers) {
-                WARN_ON(atomic_read(&eb->spinning_writers));
+                btrfs_assert_no_spinning_writers(eb);
                 atomic_dec(&eb->blocking_writers);
                 /* Use the lighter barrier after atomic */
                 smp_mb__after_atomic();
                 cond_wake_up_nomb(&eb->write_lock_wq);
         } else {
-                WARN_ON(atomic_read(&eb->spinning_writers) != 1);
-                atomic_dec(&eb->spinning_writers);
+                btrfs_assert_spinning_writers_put(eb);
                 write_unlock(&eb->lock);
         }
 }