Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 06:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs: More info on check_bucket_ref() error

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-02-11 19:31:03 -05:00
parent 930c0c4cef
commit c1f59ef6d0
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/bcachefs/buckets.c
View File

@ -663,13 +663,14 @@ err:
return ret; return ret;
} }
static int check_bucket_ref(struct bch_fs *c, static int check_bucket_ref(struct btree_trans *trans,
struct bkey_s_c k, struct bkey_s_c k,
const struct bch_extent_ptr *ptr, const struct bch_extent_ptr *ptr,
s64 sectors, enum bch_data_type ptr_data_type, s64 sectors, enum bch_data_type ptr_data_type,
u8 b_gen, u8 bucket_data_type, u8 b_gen, u8 bucket_data_type,
u32 dirty_sectors, u32 cached_sectors) u32 dirty_sectors, u32 cached_sectors)
{ {
struct bch_fs *c = trans->c;
struct bch_dev *ca = bch_dev_bkey_exists(c, ptr->dev); struct bch_dev *ca = bch_dev_bkey_exists(c, ptr->dev);
size_t bucket_nr = PTR_BUCKET_NR(ca, ptr); size_t bucket_nr = PTR_BUCKET_NR(ca, ptr);
u16 bucket_sectors = !ptr->cached u16 bucket_sectors = !ptr->cached
@ -726,7 +727,7 @@ static int check_bucket_ref(struct bch_fs *c,
if (b_gen != ptr->gen) { if (b_gen != ptr->gen) {
ret = 1; ret = 1;
goto err; goto out;
} }
if (!data_type_is_empty(bucket_data_type) && if (!data_type_is_empty(bucket_data_type) &&
@ -756,9 +757,12 @@ static int check_bucket_ref(struct bch_fs *c,
ret = -EIO; ret = -EIO;
goto err; goto err;
} }
err: out:
printbuf_exit(&buf); printbuf_exit(&buf);
return ret; return ret;
err:
bch2_dump_trans_updates(trans);
goto out;
} }
static int mark_stripe_bucket(struct btree_trans *trans, static int mark_stripe_bucket(struct btree_trans *trans,
@ -800,7 +804,7 @@ static int mark_stripe_bucket(struct btree_trans *trans,
bucket_lock(g); bucket_lock(g);
old = *g; old = *g;
ret = check_bucket_ref(c, k, ptr, sectors, data_type, ret = check_bucket_ref(trans, k, ptr, sectors, data_type,
g->gen, g->data_type, g->gen, g->data_type,
g->dirty_sectors, g->cached_sectors); g->dirty_sectors, g->cached_sectors);
if (ret) if (ret)
@ -832,7 +836,7 @@ static int __mark_pointer(struct btree_trans *trans,
u32 *dst_sectors = !ptr->cached u32 *dst_sectors = !ptr->cached
? dirty_sectors ? dirty_sectors
: cached_sectors; : cached_sectors;
int ret = check_bucket_ref(trans->c, k, ptr, sectors, ptr_data_type, int ret = check_bucket_ref(trans, k, ptr, sectors, ptr_data_type,
bucket_gen, *bucket_data_type, bucket_gen, *bucket_data_type,
*dirty_sectors, *cached_sectors); *dirty_sectors, *cached_sectors);
@ -1557,7 +1561,7 @@ static int bch2_trans_mark_stripe_bucket(struct btree_trans *trans,
if (IS_ERR(a)) if (IS_ERR(a))
return PTR_ERR(a); return PTR_ERR(a);
ret = check_bucket_ref(c, s.s_c, ptr, sectors, data_type, ret = check_bucket_ref(trans, s.s_c, ptr, sectors, data_type,
a->v.gen, a->v.data_type, a->v.gen, a->v.data_type,
a->v.dirty_sectors, a->v.cached_sectors); a->v.dirty_sectors, a->v.cached_sectors);
if (ret) if (ret)