diff options
| author | Daniel Hill <daniel@gluo.nz> | 2022-12-09 12:37:56 +1300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-01-06 19:48:01 -0500 |
| commit | 0caa0e938e2e07effde65946baece9596ba18893 (patch) | |
| tree | 6cd690733f29e0fc66cad37973defbf3a06872e1 | |
| parent | 6dee76743ae0eca9779cd01ef6a4cd6452669090 (diff) | |
bcachefs: handle failed data_update_init cleanup
data_update_init allocates several resources, but we forget to clean
these up when it fails.
Signed-off-by: Daniel Hill <daniel@gluo.nz>
| -rw-r--r-- | fs/bcachefs/data_update.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c index 5e7e3aee4817..bb1df3209c4f 100644 --- a/fs/bcachefs/data_update.c +++ b/fs/bcachefs/data_update.c @@ -460,7 +460,7 @@ int bch2_data_update_init(struct bch_fs *c, struct data_update *m, ? 0 : BCH_DISK_RESERVATION_NOFAIL); if (ret) - return ret; + goto err; } m->op.nr_replicas = m->op.nr_replicas_required = @@ -472,6 +472,14 @@ int bch2_data_update_init(struct bch_fs *c, struct data_update *m, if (bkey_extent_is_unwritten(k)) return -BCH_ERR_unwritten_extent_update; return 0; +err: + bkey_for_each_ptr_decode(k.k, ptrs, p, entry) + bch2_bucket_nocow_unlock(&c->nocow_locks, + PTR_BUCKET_POS(c, &p.ptr), 0); + + bch2_bkey_buf_exit(&m->k, c); + bch2_bio_free_pages_pool(c, &m->op.wbio.bio); + return ret; } void bch2_data_update_opts_normalize(struct bkey_s_c k, struct data_update_opts *opts) |