diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-02 07:15:07 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:09:05 +0300 |
| commit | bc3f8b25f3a4403d6e8c9067e6f0fc9cf23be6fe (patch) | |
| tree | 8313d35a9d67c0dc23763c9844ba2fba4a0403a5 /fs/bcachefs/inode.c | |
| parent | 01254036a326e0663eaeabb2eb3359c04caed2a0 (diff) | |
| download | linux-bc3f8b25f3a4403d6e8c9067e6f0fc9cf23be6fe.tar.xz | |
bcachefs: Check for errors from bch2_trans_update()
Upcoming refactoring is going to change bch2_trans_update() to start
returning transaction restarts.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/inode.c')
| -rw-r--r-- | fs/bcachefs/inode.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c index 524da018e9d9..18b568887144 100644 --- a/fs/bcachefs/inode.c +++ b/fs/bcachefs/inode.c @@ -333,8 +333,7 @@ int bch2_inode_write(struct btree_trans *trans, bch2_inode_pack(trans->c, inode_p, inode); inode_p->inode.k.p.snapshot = iter->snapshot; - bch2_trans_update(trans, iter, &inode_p->inode.k_i, 0); - return 0; + return bch2_trans_update(trans, iter, &inode_p->inode.k_i, 0); } const char *bch2_inode_invalid(const struct bch_fs *c, struct bkey_s_c k) @@ -629,9 +628,8 @@ retry: delete.k.p = iter->pos; delete.v.bi_generation = cpu_to_le32(inode_u.bi_generation + 1); - bch2_trans_update(&trans, iter, &delete.k_i, 0); - - ret = bch2_trans_commit(&trans, NULL, NULL, + ret = bch2_trans_update(&trans, iter, &delete.k_i, 0) ?: + bch2_trans_commit(&trans, NULL, NULL, BTREE_INSERT_NOFAIL); err: bch2_trans_iter_put(&trans, iter); |