mirror of https://github.com/torvalds/linux.git
btrfs: use the new ->i_state accessors
Change generated with coccinelle and fixed up by hand as appropriate. Signed-off-by: Mateusz Guzik <mjguzik@gmail.com> Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
parent
f5aa78e2be
commit
7b12a794bf
|
|
@ -3884,7 +3884,7 @@ static int btrfs_add_inode_to_root(struct btrfs_inode *inode, bool prealloc)
|
|||
ASSERT(ret != -ENOMEM);
|
||||
return ret;
|
||||
} else if (existing) {
|
||||
WARN_ON(!(existing->vfs_inode.i_state & (I_WILL_FREE | I_FREEING)));
|
||||
WARN_ON(!(inode_state_read_once(&existing->vfs_inode) & (I_WILL_FREE | I_FREEING)));
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -5361,7 +5361,7 @@ static void evict_inode_truncate_pages(struct inode *inode)
|
|||
struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
|
||||
struct rb_node *node;
|
||||
|
||||
ASSERT(inode->i_state & I_FREEING);
|
||||
ASSERT(inode_state_read_once(inode) & I_FREEING);
|
||||
truncate_inode_pages_final(&inode->i_data);
|
||||
|
||||
btrfs_drop_extent_map_range(BTRFS_I(inode), 0, (u64)-1, false);
|
||||
|
|
@ -5799,7 +5799,7 @@ struct btrfs_inode *btrfs_iget_path(u64 ino, struct btrfs_root *root,
|
|||
if (!inode)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
if (!(inode->vfs_inode.i_state & I_NEW))
|
||||
if (!(inode_state_read_once(&inode->vfs_inode) & I_NEW))
|
||||
return inode;
|
||||
|
||||
ret = btrfs_read_locked_inode(inode, path);
|
||||
|
|
@ -5823,7 +5823,7 @@ struct btrfs_inode *btrfs_iget(u64 ino, struct btrfs_root *root)
|
|||
if (!inode)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
if (!(inode->vfs_inode.i_state & I_NEW))
|
||||
if (!(inode_state_read_once(&inode->vfs_inode) & I_NEW))
|
||||
return inode;
|
||||
|
||||
path = btrfs_alloc_path();
|
||||
|
|
@ -7480,7 +7480,7 @@ static void btrfs_invalidate_folio(struct folio *folio, size_t offset,
|
|||
u64 page_start = folio_pos(folio);
|
||||
u64 page_end = page_start + folio_size(folio) - 1;
|
||||
u64 cur;
|
||||
int inode_evicting = inode->vfs_inode.i_state & I_FREEING;
|
||||
int inode_evicting = inode_state_read_once(&inode->vfs_inode) & I_FREEING;
|
||||
|
||||
/*
|
||||
* We have folio locked so no new ordered extent can be created on this
|
||||
|
|
|
|||
Loading…
Reference in New Issue