diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-06-16 19:21:21 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:02 -0400 |
| commit | a4e9e1f0cb71dfceaca0d2088465af05a747c710 (patch) | |
| tree | 990cfd866b706b9f29e3c696bef27b39f4d4ced1 /fs/bcachefs/six.c | |
| parent | 357c1261526db604dd4593638620a801c44d02bd (diff) | |
six locks: Single instance of six_lock_vals
Since we're not generating different versions of the lock functions for
each lock type, the constant propagation we were trying to do before is
no longer useful - this is now a small code size decrease.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/six.c')
| -rw-r--r-- | fs/bcachefs/six.c | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/fs/bcachefs/six.c b/fs/bcachefs/six.c index 266ee5d95479..ff5d0506662e 100644 --- a/fs/bcachefs/six.c +++ b/fs/bcachefs/six.c @@ -70,26 +70,26 @@ struct six_lock_vals { enum six_lock_type unlock_wakeup; }; -#define LOCK_VALS { \ - [SIX_LOCK_read] = { \ - .lock_val = 1ULL << SIX_STATE_READ_OFFSET, \ - .lock_fail = SIX_LOCK_HELD_write, \ - .held_mask = SIX_LOCK_HELD_read, \ - .unlock_wakeup = SIX_LOCK_write, \ - }, \ - [SIX_LOCK_intent] = { \ - .lock_val = SIX_STATE_INTENT_HELD, \ - .lock_fail = SIX_LOCK_HELD_intent, \ - .held_mask = SIX_LOCK_HELD_intent, \ - .unlock_wakeup = SIX_LOCK_intent, \ - }, \ - [SIX_LOCK_write] = { \ - .lock_val = SIX_LOCK_HELD_write, \ - .lock_fail = SIX_LOCK_HELD_read, \ - .held_mask = SIX_LOCK_HELD_write, \ - .unlock_wakeup = SIX_LOCK_read, \ - }, \ -} +static const struct six_lock_vals l[] = { + [SIX_LOCK_read] = { + .lock_val = 1ULL << SIX_STATE_READ_OFFSET, + .lock_fail = SIX_LOCK_HELD_write, + .held_mask = SIX_LOCK_HELD_read, + .unlock_wakeup = SIX_LOCK_write, + }, + [SIX_LOCK_intent] = { + .lock_val = SIX_STATE_INTENT_HELD, + .lock_fail = SIX_LOCK_HELD_intent, + .held_mask = SIX_LOCK_HELD_intent, + .unlock_wakeup = SIX_LOCK_intent, + }, + [SIX_LOCK_write] = { + .lock_val = SIX_LOCK_HELD_write, + .lock_fail = SIX_LOCK_HELD_read, + .held_mask = SIX_LOCK_HELD_write, + .unlock_wakeup = SIX_LOCK_read, + }, +}; static inline u32 six_state_seq(u64 state) { @@ -144,7 +144,6 @@ static inline unsigned pcpu_read_count(struct six_lock *lock) static int __do_six_trylock(struct six_lock *lock, enum six_lock_type type, struct task_struct *task, bool try) { - const struct six_lock_vals l[] = LOCK_VALS; int ret; u64 old, new, v; @@ -625,7 +624,6 @@ EXPORT_SYMBOL_GPL(six_lock_ip_waiter); __always_inline static void do_six_unlock_type(struct six_lock *lock, enum six_lock_type type) { - const struct six_lock_vals l[] = LOCK_VALS; u64 state; if (type == SIX_LOCK_intent) @@ -712,7 +710,6 @@ EXPORT_SYMBOL_GPL(six_lock_downgrade); */ bool six_lock_tryupgrade(struct six_lock *lock) { - const struct six_lock_vals l[] = LOCK_VALS; u64 old, new, v = atomic64_read(&lock->state); do { @@ -780,8 +777,6 @@ EXPORT_SYMBOL_GPL(six_trylock_convert); */ void six_lock_increment(struct six_lock *lock, enum six_lock_type type) { - const struct six_lock_vals l[] = LOCK_VALS; - six_acquire(&lock->dep_map, 0, type == SIX_LOCK_read, _RET_IP_); /* XXX: assert already locked, and that we don't overflow: */ |