From b08b492ed3068b80122bb58476baeacad2d0fa4c Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 8 Nov 2021 12:30:47 -0500 Subject: [PATCH] bcachefs: Drop old maybe_extending optimization The extend update path had an optimization to avoid updating the inode if we knew we were definitely not extending the file. But now that we're updating inodes on every extent update - for fsync - that code can be deleted. Signed-off-by: Kent Overstreet --- fs/bcachefs/data_update.c | 3 +-- fs/bcachefs/io.c | 34 ++-------------------------------- fs/bcachefs/io.h | 2 +- 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c index d2b1296c4c49a..700936ac44d98 100644 --- a/fs/bcachefs/data_update.c +++ b/fs/bcachefs/data_update.c @@ -126,7 +126,7 @@ int bch2_data_update_index_update(struct bch_write_op *op) struct extent_ptr_decoded p; struct bpos next_pos; bool did_work = false; - bool extending = false, should_check_enospc; + bool should_check_enospc; s64 i_sectors_delta = 0, disk_sectors_delta = 0; unsigned i; @@ -212,7 +212,6 @@ int bch2_data_update_index_update(struct bch_write_op *op) bch2_extent_normalize(c, bkey_i_to_s(insert)); ret = bch2_sum_sector_overwrites(&trans, &iter, insert, - &extending, &should_check_enospc, &i_sectors_delta, &disk_sectors_delta); diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c index fb85c2bfd569a..9cd91180d8904 100644 --- a/fs/bcachefs/io.c +++ b/fs/bcachefs/io.c @@ -198,7 +198,6 @@ void bch2_bio_alloc_pages_pool(struct bch_fs *c, struct bio *bio, int bch2_sum_sector_overwrites(struct btree_trans *trans, struct btree_iter *extent_iter, struct bkey_i *new, - bool *maybe_extending, bool *usage_increasing, s64 *i_sectors_delta, s64 *disk_sectors_delta) @@ -210,7 +209,6 @@ int bch2_sum_sector_overwrites(struct btree_trans *trans, bool new_compressed = bch2_bkey_sectors_compressed(bkey_i_to_s_c(new)); int ret = 0; - *maybe_extending = true; *usage_increasing = false; *i_sectors_delta = 0; *disk_sectors_delta = 0; @@ -237,31 +235,8 @@ int bch2_sum_sector_overwrites(struct btree_trans *trans, (!new_compressed && bch2_bkey_sectors_compressed(old)))) *usage_increasing = true; - if (bkey_ge(old.k->p, new->k.p)) { - /* - * Check if there's already data above where we're - * going to be writing to - this means we're definitely - * not extending the file: - * - * Note that it's not sufficient to check if there's - * data up to the sector offset we're going to be - * writing to, because i_size could be up to one block - * less: - */ - if (!bkey_cmp(old.k->p, new->k.p)) { - old = bch2_btree_iter_next(&iter); - ret = bkey_err(old); - if (ret) - break; - } - - if (old.k && !bkey_err(old) && - old.k->p.inode == extent_iter->pos.inode && - bkey_extent_is_data(old.k)) - *maybe_extending = false; - + if (bkey_ge(old.k->p, new->k.p)) break; - } } bch2_trans_iter_exit(trans, &iter); @@ -283,7 +258,7 @@ int bch2_extent_update(struct btree_trans *trans, struct bch_inode_unpacked inode_u; struct bpos next_pos; struct bkey_s_c inode; - bool extending = false, usage_increasing; + bool usage_increasing; s64 i_sectors_delta = 0, disk_sectors_delta = 0; int ret; @@ -305,7 +280,6 @@ int bch2_extent_update(struct btree_trans *trans, next_pos = k->k.p; ret = bch2_sum_sector_overwrites(trans, iter, k, - &extending, &usage_increasing, &i_sectors_delta, &disk_sectors_delta); @@ -322,10 +296,6 @@ int bch2_extent_update(struct btree_trans *trans, return ret; } - new_i_size = extending - ? min(k->k.p.offset << 9, new_i_size) - : 0; - bch2_trans_iter_init(trans, &inode_iter, BTREE_ID_inodes, SPOS(0, inum.inum, iter->snapshot), BTREE_ITER_INTENT| diff --git a/fs/bcachefs/io.h b/fs/bcachefs/io.h index faf2c2057828b..39f2aabf4f596 100644 --- a/fs/bcachefs/io.h +++ b/fs/bcachefs/io.h @@ -70,7 +70,7 @@ static inline struct workqueue_struct *index_update_wq(struct bch_write_op *op) } int bch2_sum_sector_overwrites(struct btree_trans *, struct btree_iter *, - struct bkey_i *, bool *, bool *, s64 *, s64 *); + struct bkey_i *, bool *, s64 *, s64 *); int bch2_extent_update(struct btree_trans *, subvol_inum, struct btree_iter *, struct bkey_i *, struct disk_reservation *, u64, s64 *, bool); -- 2.30.2