diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-11 22:22:59 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-11 22:25:12 -0400 |
| commit | f3976e3733e97a0e96f5fc6349d1e82b25116043 (patch) | |
| tree | 87ab725ba56735f2157e77dc6bc4bc1c910890b2 /libbcachefs/btree_update.h | |
| parent | bcee0320dcb53adb3786330a00a101840f2939d0 (diff) | |
Update bcachefs sources to b0788c47d9 bcachefs: Fix check_version_upgrade()
Diffstat (limited to 'libbcachefs/btree_update.h')
| -rw-r--r-- | libbcachefs/btree_update.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbcachefs/btree_update.h b/libbcachefs/btree_update.h index 2281140a..901c42b5 100644 --- a/libbcachefs/btree_update.h +++ b/libbcachefs/btree_update.h @@ -268,10 +268,10 @@ static inline struct bkey_i *__bch2_bkey_get_mut_noupdate(struct btree_trans *tr { struct bkey_s_c k = __bch2_bkey_get_iter(trans, iter, btree_id, pos, flags|BTREE_ITER_INTENT, type); - struct bkey_i *ret = unlikely(IS_ERR(k.k)) + struct bkey_i *ret = IS_ERR(k.k) ? ERR_CAST(k.k) : __bch2_bkey_make_mut_noupdate(trans, k, 0, min_bytes); - if (unlikely(IS_ERR(ret))) + if (IS_ERR(ret)) bch2_trans_iter_exit(trans, iter); return ret; } |