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 <kent.overstreet@gmail.com>

diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c
index d2b1296c4c49a7c9fd6983ac28097fe9c8fe1d90..700936ac44d98758d13ca7245a2d83204047510d 100644 (file)
--- 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 fb85c2bfd569ae76f51543e801a313d78ad5225d..9cd91180d8904208f11b98736bf8737d8d4da0c1 100644 (file)
--- 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 faf2c2057828b9ba6212822f82d62629bd2b20a0..39f2aabf4f5969ac93b18e1875f63d0e24cc3020 100644 (file)
--- 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);