From: Simon Glass <simon.glass@canonical.com> Move these filesystem helpers to linux/fs.h where related functions reside. This reduces ext4_uboot.h from 435 to 431 lines. Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- fs/ext4l/ext4_uboot.h | 4 ---- include/linux/fs.h | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/ext4l/ext4_uboot.h b/fs/ext4l/ext4_uboot.h index 9ddd88d78aa..8d1aa0e504e 100644 --- a/fs/ext4l/ext4_uboot.h +++ b/fs/ext4l/ext4_uboot.h @@ -196,10 +196,6 @@ struct path; /* hash_64 - use linux/hash.h */ #include <linux/hash.h> -/* Dentry operations are now in linux/dcache.h */ -#define finish_open_simple(f, e) (e) -#define ihold(i) do { (void)(i); } while (0) - #include <linux/path.h> #include <linux/dax.h> diff --git a/include/linux/fs.h b/include/linux/fs.h index 0f3e44214c5..5b865715d51 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -570,12 +570,14 @@ int inode_generic_drop(struct inode *inode); struct inode *new_inode(struct super_block *sb); struct inode *iget_locked(struct super_block *sb, unsigned long ino); void iput(struct inode *inode); +#define ihold(i) do { (void)(i); } while (0) /* Block mapping - implemented in ext4l/stub.c */ int bmap(struct inode *inode, sector_t *block); /* Simple filesystem helpers */ #define simple_open(i, f) ({ (void)(i); (void)(f); 0; }) +#define finish_open_simple(f, e) (e) /* simple_get_link - for fast symlinks stored in inode */ struct delayed_call; -- 2.43.0