diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-03-31 18:40:01 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-04-03 12:44:15 -0400 |
| commit | 5d0c7f8f9969b92b4ddc9e8bd57ecd666cee8af9 (patch) | |
| tree | 7f4293fd7d454b93904a0c37b5be0fa62449193b | |
| parent | 5deb5110786e09371b4572c7684fbd76691b1108 (diff) | |
bcachefs: fix bch2_trans_unlock()
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index bbf6d17355ba..ef0d058dc9a9 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -1704,7 +1704,7 @@ void bch2_trans_preload_iters(struct btree_trans *trans) static int btree_trans_iter_alloc(struct btree_trans *trans) { - unsigned idx = ffz(trans->iters_linked); + unsigned idx = __ffs64(~trans->iters_linked); if (idx < trans->nr_iters) goto got_slot; @@ -1869,17 +1869,17 @@ void *bch2_trans_kmalloc(struct btree_trans *trans, int bch2_trans_unlock(struct btree_trans *trans) { - unsigned iters = trans->iters_linked; + u64 iters = trans->iters_linked; int ret = 0; while (iters) { - unsigned idx = __ffs(iters); + unsigned idx = __ffs64(iters); struct btree_iter *iter = &trans->iters[idx]; ret = ret ?: btree_iter_err(iter); __bch2_btree_iter_unlock(iter); - iters ^= 1 << idx; + iters ^= 1ULL << idx; } return ret; |