tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Mateusz Guzik and committed by
Christian Brauner 7b12a794 f5aa78e2

+5 -5
+5 -5
fs/btrfs/inode.c
··· 3884 3884 ASSERT(ret != -ENOMEM); 3885 3885 return ret; 3886 3886 } else if (existing) { 3887 - WARN_ON(!(existing->vfs_inode.i_state & (I_WILL_FREE | I_FREEING))); 3887 + WARN_ON(!(inode_state_read_once(&existing->vfs_inode) & (I_WILL_FREE | I_FREEING))); 3888 3888 } 3889 3889 3890 3890 return 0; ··· 5361 5361 struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree; 5362 5362 struct rb_node *node; 5363 5363 5364 - ASSERT(inode->i_state & I_FREEING); 5364 + ASSERT(inode_state_read_once(inode) & I_FREEING); 5365 5365 truncate_inode_pages_final(&inode->i_data); 5366 5366 5367 5367 btrfs_drop_extent_map_range(BTRFS_I(inode), 0, (u64)-1, false); ··· 5799 5799 if (!inode) 5800 5800 return ERR_PTR(-ENOMEM); 5801 5801 5802 - if (!(inode->vfs_inode.i_state & I_NEW)) 5802 + if (!(inode_state_read_once(&inode->vfs_inode) & I_NEW)) 5803 5803 return inode; 5804 5804 5805 5805 ret = btrfs_read_locked_inode(inode, path); ··· 5823 5823 if (!inode) 5824 5824 return ERR_PTR(-ENOMEM); 5825 5825 5826 - if (!(inode->vfs_inode.i_state & I_NEW)) 5826 + if (!(inode_state_read_once(&inode->vfs_inode) & I_NEW)) 5827 5827 return inode; 5828 5828 5829 5829 path = btrfs_alloc_path(); ··· 7480 7480 u64 page_start = folio_pos(folio); 7481 7481 u64 page_end = page_start + folio_size(folio) - 1; 7482 7482 u64 cur; 7483 - int inode_evicting = inode->vfs_inode.i_state & I_FREEING; 7483 + int inode_evicting = inode_state_read_once(&inode->vfs_inode) & I_FREEING; 7484 7484 7485 7485 /* 7486 7486 * We have folio locked so no new ordered extent can be created on this