diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-21 22:40:40 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:10:02 +0300 |
| commit | 91d16f16d0fd4b6eb8503068ea7f6ad8305e32db (patch) | |
| tree | 277706ee9c5ca1b52f3a10612b26687980698f92 /fs/bcachefs/btree_locking.h | |
| parent | 1fb4fe63178881a0ac043a5c05288d9fff85d6b8 (diff) | |
| download | linux-91d16f16d0fd4b6eb8503068ea7f6ad8305e32db.tar.xz | |
six locks: Documentation, renaming
- Expanded and revamped overview documentation in six.h, giving an
overview of all features
- docbook-comments for all external interfaces
- Rename some functions for simplicity, i.e.
six_lock_ip_type() -> six_lock_ip()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_locking.h')
| -rw-r--r-- | fs/bcachefs/btree_locking.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_locking.h b/fs/bcachefs/btree_locking.h index a897bdc123c3..f9bb8736c061 100644 --- a/fs/bcachefs/btree_locking.h +++ b/fs/bcachefs/btree_locking.h @@ -205,8 +205,8 @@ static inline int __btree_node_lock_nopath(struct btree_trans *trans, trans->lock_must_abort = false; trans->locking = b; - ret = six_lock_type_ip_waiter(&b->lock, type, &trans->locking_wait, - bch2_six_check_for_deadlock, trans, ip); + ret = six_lock_ip_waiter(&b->lock, type, &trans->locking_wait, + bch2_six_check_for_deadlock, trans, ip); WRITE_ONCE(trans->locking, NULL); WRITE_ONCE(trans->locking_wait.start_time, 0); return ret; |