diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-12-28 07:19:09 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-06 07:24:19 +0300 |
| commit | 717296c34c8d9d13d7aad4d710b0c3bdb285783b (patch) | |
| tree | e458287091df3435dabd74d4cd34d2ebea33a019 /fs/bcachefs/inode.c | |
| parent | eff1f728bedc014c783752af5d2a88c46586f654 (diff) | |
| download | linux-717296c34c8d9d13d7aad4d710b0c3bdb285783b.tar.xz | |
bcachefs: trans_mark now takes bkey_s
Prep work for disk space accounting rewrite: we're going to want to use
a single callback for both of our current triggers, so we need to change
them to have the same type signature first.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/inode.c')
| -rw-r--r-- | fs/bcachefs/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c index c39844b8e596..32e0736ba718 100644 --- a/fs/bcachefs/inode.c +++ b/fs/bcachefs/inode.c @@ -564,12 +564,12 @@ static inline bool bkey_is_deleted_inode(struct bkey_s_c k) int bch2_trans_mark_inode(struct btree_trans *trans, enum btree_id btree_id, unsigned level, struct bkey_s_c old, - struct bkey_i *new, + struct bkey_s new, unsigned flags) { - int nr = bkey_is_inode(&new->k) - bkey_is_inode(old.k); + s64 nr = bkey_is_inode(new.k) - bkey_is_inode(old.k); bool old_deleted = bkey_is_deleted_inode(old); - bool new_deleted = bkey_is_deleted_inode(bkey_i_to_s_c(new)); + bool new_deleted = bkey_is_deleted_inode(new.s_c); if (nr) { int ret = bch2_replicas_deltas_realloc(trans, 0); @@ -582,7 +582,7 @@ int bch2_trans_mark_inode(struct btree_trans *trans, } if (old_deleted != new_deleted) { - int ret = bch2_btree_bit_mod(trans, BTREE_ID_deleted_inodes, new->k.p, new_deleted); + int ret = bch2_btree_bit_mod(trans, BTREE_ID_deleted_inodes, new.k->p, new_deleted); if (ret) return ret; } |