From: Simon Glass <simon.glass@canonical.com> Move the inode state accessor functions from ext4_uboot.h to include/linux/fs.h where struct inode is defined. This includes: - inode_state_read_once(), inode_state_read() - inode_state_set_raw(), inode_state_set() - inode_state_clear_raw(), inode_state_clear() - inode_state_assign_raw(), inode_state_assign() Co-developed-by: Claude (Anthropic) Signed-off-by: Simon Glass <simon.glass@canonical.com> --- fs/ext4l/ext4_uboot.h | 46 ------------------------------------------- include/linux/fs.h | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/fs/ext4l/ext4_uboot.h b/fs/ext4l/ext4_uboot.h index 278351a9fef..d3ad76f2618 100644 --- a/fs/ext4l/ext4_uboot.h +++ b/fs/ext4l/ext4_uboot.h @@ -183,52 +183,6 @@ static inline int bdev_read_only(struct block_device *bdev) #define WHITEOUT_DEV 0 #define WHITEOUT_MODE 0 -/* - * Inode state accessors - simplified for single-threaded U-Boot. - * Linux uses READ_ONCE/WRITE_ONCE and lockdep assertions; we use direct access. - */ -static inline unsigned long inode_state_read_once(struct inode *inode) -{ - return inode->i_state; -} - -static inline unsigned long inode_state_read(struct inode *inode) -{ - return inode->i_state; -} - -static inline void inode_state_set_raw(struct inode *inode, unsigned long flags) -{ - inode->i_state |= flags; -} - -static inline void inode_state_set(struct inode *inode, unsigned long flags) -{ - inode->i_state |= flags; -} - -static inline void inode_state_clear_raw(struct inode *inode, - unsigned long flags) -{ - inode->i_state &= ~flags; -} - -static inline void inode_state_clear(struct inode *inode, unsigned long flags) -{ - inode->i_state &= ~flags; -} - -static inline void inode_state_assign_raw(struct inode *inode, - unsigned long flags) -{ - inode->i_state = flags; -} - -static inline void inode_state_assign(struct inode *inode, unsigned long flags) -{ - inode->i_state = flags; -} - /* QSTR_INIT and dotdot_name are now in linux/dcache.h */ /* diff --git a/include/linux/fs.h b/include/linux/fs.h index e78ac5f7284..f50a081b32b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -227,6 +227,52 @@ static inline unsigned int i_gid_read(const struct inode *inode) return inode->i_gid.val; } +/* + * Inode state accessors - simplified for single-threaded U-Boot. + * Linux uses READ_ONCE/WRITE_ONCE and lockdep assertions; we use direct access. + */ +static inline unsigned long inode_state_read_once(struct inode *inode) +{ + return inode->i_state; +} + +static inline unsigned long inode_state_read(struct inode *inode) +{ + return inode->i_state; +} + +static inline void inode_state_set_raw(struct inode *inode, unsigned long flags) +{ + inode->i_state |= flags; +} + +static inline void inode_state_set(struct inode *inode, unsigned long flags) +{ + inode->i_state |= flags; +} + +static inline void inode_state_clear_raw(struct inode *inode, + unsigned long flags) +{ + inode->i_state &= ~flags; +} + +static inline void inode_state_clear(struct inode *inode, unsigned long flags) +{ + inode->i_state &= ~flags; +} + +static inline void inode_state_assign_raw(struct inode *inode, + unsigned long flags) +{ + inode->i_state = flags; +} + +static inline void inode_state_assign(struct inode *inode, unsigned long flags) +{ + inode->i_state = flags; +} + /* block_device - minimal stub */ struct block_device { struct address_space *bd_mapping; -- 2.43.0