Use the helpers where open coded. On non-debug builds, the warnings will not trigger and extent_buffer::read_locks become unused and can be moved to the appropriate section, saving a few bytes.
Signed-off-by: David Sterba <[email protected]> --- fs/btrfs/extent_io.c | 2 +- fs/btrfs/extent_io.h | 2 +- fs/btrfs/locking.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 30363cb97625..a74495bdb552 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4669,7 +4669,6 @@ __alloc_extent_buffer(struct btrfs_fs_info *fs_info, u64 start, eb->bflags = 0; rwlock_init(&eb->lock); atomic_set(&eb->write_locks, 0); - atomic_set(&eb->read_locks, 0); atomic_set(&eb->blocking_readers, 0); atomic_set(&eb->blocking_writers, 0); eb->lock_nested = 0; @@ -4692,6 +4691,7 @@ __alloc_extent_buffer(struct btrfs_fs_info *fs_info, u64 start, #ifdef CONFIG_BTRFS_DEBUG atomic_set(&eb->spinning_writers, 0); atomic_set(&eb->spinning_readers, 0); + atomic_set(&eb->read_locks, 0); #endif return eb; diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index e49310d2caf4..fee8c8c463b8 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -148,7 +148,6 @@ struct extent_buffer { /* count of read lock holders on the extent buffer */ atomic_t write_locks; - atomic_t read_locks; atomic_t blocking_writers; atomic_t blocking_readers; short lock_nested; @@ -171,6 +170,7 @@ struct extent_buffer { #ifdef CONFIG_BTRFS_DEBUG atomic_t spinning_writers; atomic_t spinning_readers; + atomic_t read_locks; struct list_head leak_list; #endif }; diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c index 947c66c01e34..e88a0a3d286f 100644 --- a/fs/btrfs/locking.c +++ b/fs/btrfs/locking.c @@ -164,7 +164,7 @@ void btrfs_tree_read_lock(struct extent_buffer *eb) atomic_read(&eb->blocking_writers) == 0); goto again; } - atomic_inc(&eb->read_locks); + btrfs_assert_tree_read_locks_get(eb); btrfs_assert_spinning_readers_get(eb); } @@ -183,7 +183,7 @@ int btrfs_tree_read_lock_atomic(struct extent_buffer *eb) read_unlock(&eb->lock); return 0; } - atomic_inc(&eb->read_locks); + btrfs_assert_tree_read_locks_get(eb); btrfs_assert_spinning_readers_get(eb); return 1; } @@ -204,7 +204,7 @@ int btrfs_try_tree_read_lock(struct extent_buffer *eb) read_unlock(&eb->lock); return 0; } - atomic_inc(&eb->read_locks); + btrfs_assert_tree_read_locks_get(eb); btrfs_assert_spinning_readers_get(eb); return 1; } @@ -248,7 +248,7 @@ void btrfs_tree_read_unlock(struct extent_buffer *eb) } btrfs_assert_tree_read_locked(eb); btrfs_assert_spinning_readers_put(eb); - atomic_dec(&eb->read_locks); + btrfs_assert_tree_read_locks_put(eb); read_unlock(&eb->lock); } @@ -272,7 +272,7 @@ void btrfs_tree_read_unlock_blocking(struct extent_buffer *eb) /* atomic_dec_and_test implies a barrier */ if (atomic_dec_and_test(&eb->blocking_readers)) cond_wake_up_nomb(&eb->read_lock_wq); - atomic_dec(&eb->read_locks); + btrfs_assert_tree_read_locks_put(eb); } /* -- 2.20.1
