UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: use assertion helpers for extent buffer write lock counters 

Use the helpers where open coded. On non-debug builds, the warnings will
not trigger and extent_buffer::write_locks 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>
This commit is contained in:
David Sterba 2018-08-24 16:24:26 +02:00
parent e3f1538867
commit c79adfc085
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/extent_io.c
View File

@ -4677,7 +4677,6 @@ __alloc_extent_buffer(struct btrfs_fs_info *fs_info, u64 start,
eb->fs_info = fs_info; eb->fs_info = fs_info;
eb->bflags = 0; eb->bflags = 0;
rwlock_init(&eb->lock); rwlock_init(&eb->lock);
atomic_set(&eb->write_locks, 0);
atomic_set(&eb->blocking_readers, 0); atomic_set(&eb->blocking_readers, 0);
atomic_set(&eb->blocking_writers, 0); atomic_set(&eb->blocking_writers, 0);
eb->lock_nested = 0; eb->lock_nested = 0;
@ -4701,6 +4700,7 @@ __alloc_extent_buffer(struct btrfs_fs_info *fs_info, u64 start,
atomic_set(&eb->spinning_writers, 0); atomic_set(&eb->spinning_writers, 0);
atomic_set(&eb->spinning_readers, 0); atomic_set(&eb->spinning_readers, 0);
atomic_set(&eb->read_locks, 0); atomic_set(&eb->read_locks, 0);
atomic_set(&eb->write_locks, 0);
#endif #endif
return eb; return eb;

3
fs/btrfs/extent_io.h
View File

@ -160,8 +160,6 @@ struct extent_buffer {
struct rcu_head rcu_head; struct rcu_head rcu_head;
pid_t lock_owner; pid_t lock_owner;
/* count of read lock holders on the extent buffer */
atomic_t write_locks;
atomic_t blocking_writers; atomic_t blocking_writers;
atomic_t blocking_readers; atomic_t blocking_readers;
short lock_nested; short lock_nested;
@ -185,6 +183,7 @@ struct extent_buffer {
atomic_t spinning_writers; atomic_t spinning_writers;
atomic_t spinning_readers; atomic_t spinning_readers;
atomic_t read_locks; atomic_t read_locks;
atomic_t write_locks;
struct list_head leak_list; struct list_head leak_list;
#endif #endif
}; };

6
fs/btrfs/locking.c
View File

@ -243,7 +243,7 @@ int btrfs_try_tree_write_lock(struct extent_buffer *eb)
write_unlock(&eb->lock); write_unlock(&eb->lock);
return 0; return 0;
} }
atomic_inc(&eb->write_locks); btrfs_assert_tree_write_locks_get(eb);
btrfs_assert_spinning_writers_get(eb); btrfs_assert_spinning_writers_get(eb);
eb->lock_owner = current->pid; eb->lock_owner = current->pid;
return 1; return 1;
@ -310,7 +310,7 @@ again:
goto again; goto again;
} }
btrfs_assert_spinning_writers_get(eb); btrfs_assert_spinning_writers_get(eb);
atomic_inc(&eb->write_locks); btrfs_assert_tree_write_locks_get(eb);
eb->lock_owner = current->pid; eb->lock_owner = current->pid;
} }
@ -325,7 +325,7 @@ void btrfs_tree_unlock(struct extent_buffer *eb)
btrfs_assert_tree_locked(eb); btrfs_assert_tree_locked(eb);
eb->lock_owner = 0; eb->lock_owner = 0;
atomic_dec(&eb->write_locks); btrfs_assert_tree_write_locks_put(eb);
if (blockers) { if (blockers) {
btrfs_assert_no_spinning_writers(eb); btrfs_assert_no_spinning_writers(eb);