diff options
author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-11-09 19:02:48 -0500 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:32 -0400 |
commit | 085ab69357e091613625f1505d667b6a5a3ec881 (patch) | |
tree | df5f4d2d258b9bade329e662464a6a3139a7f384 /fs/bcachefs/fs-io.c | |
parent | ad44bdc351faeacb9b7294f1689ac76babf379ad (diff) |
bcachefs: Rework of cut_front & cut_back
This changes bch2_cut_front and bch2_cut_back so that they're able to
shorten the size of the value, and it also changes the extent update
path to update the accounting in the btree node when this happens.
When the size of the value is shortened, they zero out the space that's
no longer used, so it's interpreted as noops (as implemented in the last
patch).
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/fs-io.c')
-rw-r--r-- | fs/bcachefs/fs-io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c index 478630fdf643..8b8442f9a81c 100644 --- a/fs/bcachefs/fs-io.c +++ b/fs/bcachefs/fs-io.c @@ -2485,7 +2485,7 @@ reassemble: move_pos.offset -= shift >> 9; goto reassemble; } else { - bch2_cut_back(atomic_end, ©.k->k); + bch2_cut_back(atomic_end, copy.k); } } @@ -2505,7 +2505,7 @@ reassemble: */ if (insert && bkey_cmp(bkey_start_pos(©.k->k), delete.k.p) < 0) { - bch2_cut_back(bkey_start_pos(©.k->k), &delete.k); + bch2_cut_back(bkey_start_pos(©.k->k), &delete); } else if (!insert && bkey_cmp(copy.k->k.p, bkey_start_pos(&delete.k)) > 0) { @@ -2652,8 +2652,8 @@ static long bchfs_fallocate(struct bch_inode_info *inode, int mode, reservation.k.p = k.k->p; reservation.k.size = k.k->size; - bch2_cut_front(iter->pos, &reservation.k_i); - bch2_cut_back(end_pos, &reservation.k); + bch2_cut_front(iter->pos, &reservation.k_i); + bch2_cut_back(end_pos, &reservation.k_i); sectors = reservation.k.size; reservation.v.nr_replicas = bch2_bkey_nr_dirty_ptrs(k); |