summaryrefslogtreecommitdiff
path: root/libbcachefs/subvolume.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2025-07-01 13:19:04 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2025-07-02 14:45:52 -0400
commit27e51d62ea4d030a74357ce436886f4187f9380c (patch)
treee22ea35e64961f8888eae8d7a0cfe27fdc966c62 /libbcachefs/subvolume.c
parent4145de1746459e118783b51e45f9a1fe9b6d2005 (diff)
Update bcachefs sources to 48d506769bc0 bcachefs: bch2_journal_entry_missing_range()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/subvolume.c')
-rw-r--r--libbcachefs/subvolume.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libbcachefs/subvolume.c b/libbcachefs/subvolume.c
index 02058744..353df662 100644
--- a/libbcachefs/subvolume.c
+++ b/libbcachefs/subvolume.c
@@ -70,7 +70,7 @@ static int check_subvol(struct btree_trans *trans,
if (BCH_SUBVOLUME_UNLINKED(subvol.v)) {
ret = bch2_subvolume_delete(trans, iter->pos.offset);
bch_err_msg(c, ret, "deleting subvolume %llu", iter->pos.offset);
- return ret ?: -BCH_ERR_transaction_restart_nested;
+ return ret ?: bch_err_throw(c, transaction_restart_nested);
}
if (fsck_err_on(subvol.k->p.offset == BCACHEFS_ROOT_SUBVOL &&
@@ -310,7 +310,7 @@ int bch2_subvol_has_children(struct btree_trans *trans, u32 subvol)
bch2_trans_iter_exit(trans, &iter);
return bkey_err(k) ?: k.k && k.k->p.inode == subvol
- ? -BCH_ERR_ENOTEMPTY_subvol_not_empty
+ ? bch_err_throw(trans->c, ENOTEMPTY_subvol_not_empty)
: 0;
}