Signed-off-by: Mateusz Guzik <mjguzik@xxxxxxxxx>
---
fs/bcachefs/fs.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index 687af0eea0c2..172685ced878 100644
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -347,7 +347,7 @@ static struct bch_inode_info *bch2_inode_hash_find(struct bch_fs *c, struct btre
spin_unlock(&inode->v.i_lock);
return NULL;
}
- if ((inode->v.i_state & (I_FREEING|I_WILL_FREE))) {
+ if ((inode_state_read(&inode->v) & (I_FREEING|I_WILL_FREE))) {
if (!trans) {
__wait_on_freeing_inode(c, inode, inum);
} else {
@@ -411,7 +411,7 @@ static struct bch_inode_info *bch2_inode_hash_insert(struct bch_fs *c,
* only insert fully created inodes in the inode hash table. But
* discard_new_inode() expects it to be set...
*/
- inode->v.i_state |= I_NEW;
+ inode_state_set_unchecked(&inode->v, inode_state_read_unlocked(&inode->v) | I_NEW);
/*
* We don't want bch2_evict_inode() to delete the inode on disk,
* we just raced and had another inode in cache. Normally new
@@ -2224,8 +2224,8 @@ void bch2_evict_subvolume_inodes(struct bch_fs *c, snapshot_id_list *s)
if (!snapshot_list_has_id(s, inode->ei_inum.subvol))
continue;
- if (!(inode->v.i_state & I_DONTCACHE) &&
- !(inode->v.i_state & I_FREEING) &&
+ if (!(inode_state_read_unlocked(&inode->v) & I_DONTCACHE) &&
+ !(inode_state_read_unlocked(&inode->v) & I_FREEING) &&
igrab(&inode->v)) {
this_pass_clean = false;
--
2.43.0
