diff options
Diffstat (limited to 'libbcachefs/journal.h')
| -rw-r--r-- | libbcachefs/journal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libbcachefs/journal.h b/libbcachefs/journal.h index fd1f7cda..00d0f4fc 100644 --- a/libbcachefs/journal.h +++ b/libbcachefs/journal.h @@ -327,10 +327,10 @@ static inline int journal_res_get_fast(struct journal *j, unsigned flags) { union journal_res_state old, new; - u64 v = atomic64_read(&j->reservations.counter); + old.v = atomic64_read(&j->reservations.counter); do { - old.v = new.v = v; + new.v = old.v; /* * Check if there is still room in the current journal @@ -356,8 +356,8 @@ static inline int journal_res_get_fast(struct journal *j, if (flags & JOURNAL_RES_GET_CHECK) return 1; - } while ((v = atomic64_cmpxchg(&j->reservations.counter, - old.v, new.v)) != old.v); + } while (!atomic64_try_cmpxchg(&j->reservations.counter, + &old.v, new.v)); res->ref = true; res->idx = old.idx; |