diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-01-06 06:29:04 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:48 -0400 |
| commit | c515e3f019fe0ab60ae6f5343d211f52b8a2c759 (patch) | |
| tree | ab07882a1845d00aea65b64274e9041bf6c9dd24 /fs/bcachefs/inode.c | |
| parent | 494dcc57a7bf639c39364b5f84c1b6db39a0f83a (diff) | |
| download | lwn-c515e3f019fe0ab60ae6f5343d211f52b8a2c759.tar.gz lwn-c515e3f019fe0ab60ae6f5343d211f52b8a2c759.zip | |
bcachefs: Kill bch2_extent_trim_atomic() usage
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/inode.c')
| -rw-r--r-- | fs/bcachefs/inode.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c index cf453edcb5ab..141cf21e2951 100644 --- a/fs/bcachefs/inode.c +++ b/fs/bcachefs/inode.c @@ -595,11 +595,11 @@ static int bch2_inode_delete_keys(struct btree_trans *trans, int ret = 0; /* - * We're never going to be deleting extents, no need to use an extent - * iterator: + * We're never going to be deleting partial extents, no need to use an + * extent iterator: */ bch2_trans_iter_init(trans, &iter, id, POS(inum.inum, 0), - BTREE_ITER_INTENT); + BTREE_ITER_INTENT|BTREE_ITER_NOT_EXTENTS); while (1) { bch2_trans_begin(trans); @@ -621,14 +621,6 @@ static int bch2_inode_delete_keys(struct btree_trans *trans, bkey_init(&delete.k); delete.k.p = iter.pos; - if (iter.flags & BTREE_ITER_IS_EXTENTS) { - bch2_key_resize(&delete.k, k.k->p.offset - iter.pos.offset); - - ret = bch2_extent_trim_atomic(trans, &iter, &delete); - if (ret) - goto err; - } - ret = bch2_trans_update(trans, &iter, &delete, 0) ?: bch2_trans_commit(trans, NULL, NULL, BTREE_INSERT_NOFAIL); |