summaryrefslogtreecommitdiff
path: root/libbcachefs/extents.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2025-06-02 17:24:53 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2025-06-02 17:24:53 -0400
commit838bbd755ea6a501892546b07b77d0605d2114f0 (patch)
tree434c96e7e06824c21532d482441554dc4228c7b8 /libbcachefs/extents.c
parent315508358d5880f4b4b801d932fa15781acdee90 (diff)
Update bcachefs sources to a41cc7750fb8 bcachefs: Add flags to subvolume_to_text()
Diffstat (limited to 'libbcachefs/extents.c')
-rw-r--r--libbcachefs/extents.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libbcachefs/extents.c b/libbcachefs/extents.c
index 677cf453..036e4ad9 100644
--- a/libbcachefs/extents.c
+++ b/libbcachefs/extents.c
@@ -193,7 +193,7 @@ int bch2_bkey_pick_read_device(struct bch_fs *c, struct bkey_s_c k,
bool have_dirty_ptrs = false, have_pick = false;
if (k.k->type == KEY_TYPE_error)
- return -BCH_ERR_key_type_error;
+ return bch_err_throw(c, key_type_error);
rcu_read_lock();
struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);
@@ -286,17 +286,17 @@ int bch2_bkey_pick_read_device(struct bch_fs *c, struct bkey_s_c k,
if (!have_dirty_ptrs)
return 0;
if (have_missing_devs)
- return -BCH_ERR_no_device_to_read_from;
+ return bch_err_throw(c, no_device_to_read_from);
if (have_csum_errors)
- return -BCH_ERR_data_read_csum_err;
+ return bch_err_throw(c, data_read_csum_err);
if (have_io_errors)
- return -BCH_ERR_data_read_io_err;
+ return bch_err_throw(c, data_read_io_err);
/*
* If we get here, we have pointers (bkey_ptrs_validate() ensures that),
* but they don't point to valid devices:
*/
- return -BCH_ERR_no_devices_valid;
+ return bch_err_throw(c, no_devices_valid);
}
/* KEY_TYPE_btree_ptr: */
@@ -1515,7 +1515,7 @@ int bch2_bkey_ptrs_validate(struct bch_fs *c, struct bkey_s_c k,
struct bch_compression_opt opt = __bch2_compression_decode(r->compression);
prt_printf(err, "invalid compression opt %u:%u",
opt.type, opt.level);
- return -BCH_ERR_invalid_bkey;
+ return bch_err_throw(c, invalid_bkey);
}
#endif
break;