From: Simon Glass <simon.glass@canonical.com> Move file operation flags from ext4_uboot.h to linux/fs.h: - FALLOC_FL_*: fallocate operation flags (KEEP_SIZE, PUNCH_HOLE, COLLAPSE_RANGE, ZERO_RANGE, INSERT_RANGE, WRITE_ZEROES, ALLOCATE_RANGE, MODE_MASK) - RENAME_*: rename operation flags (NOREPLACE, EXCHANGE, WHITEOUT) Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- fs/ext4l/ext4_uboot.h | 15 ++------------- include/linux/fs.h | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/fs/ext4l/ext4_uboot.h b/fs/ext4l/ext4_uboot.h index 5f3fcaae30b..b7b42392033 100644 --- a/fs/ext4l/ext4_uboot.h +++ b/fs/ext4l/ext4_uboot.h @@ -154,15 +154,7 @@ struct kobject { #define FIEMAP_EXTENT_UNWRITTEN 0x00000800 #define EXT4_FIEMAP_EXTENT_HOLE 0x08000000 -/* FALLOC flags */ -#define FALLOC_FL_KEEP_SIZE 0x01 -#define FALLOC_FL_PUNCH_HOLE 0x02 -#define FALLOC_FL_COLLAPSE_RANGE 0x08 -#define FALLOC_FL_ZERO_RANGE 0x10 -#define FALLOC_FL_INSERT_RANGE 0x20 -#define FALLOC_FL_WRITE_ZEROES 0x40 -#define FALLOC_FL_ALLOCATE_RANGE 0x80 -#define FALLOC_FL_MODE_MASK 0xff +/* FALLOC_FL_* flags are in linux/fs.h */ /* File flags */ #define O_SYNC 0 @@ -596,10 +588,7 @@ static inline int bdev_read_only(struct block_device *bdev) #define WHITEOUT_DEV 0 #define WHITEOUT_MODE 0 -/* Rename flags */ -#define RENAME_NOREPLACE (1 << 0) -#define RENAME_EXCHANGE (1 << 1) -#define RENAME_WHITEOUT (1 << 2) +/* RENAME_* flags are in linux/fs.h */ /* Inode dirty state flags */ #define I_DIRTY_TIME (1 << 3) diff --git a/include/linux/fs.h b/include/linux/fs.h index 25966447cf2..3156a261724 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -188,6 +188,21 @@ static inline void inode_init_once(struct inode *inode) #define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO) #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) +/* Rename flags */ +#define RENAME_NOREPLACE (1 << 0) +#define RENAME_EXCHANGE (1 << 1) +#define RENAME_WHITEOUT (1 << 2) + +/* fallocate() flags */ +#define FALLOC_FL_KEEP_SIZE 0x01 +#define FALLOC_FL_PUNCH_HOLE 0x02 +#define FALLOC_FL_COLLAPSE_RANGE 0x08 +#define FALLOC_FL_ZERO_RANGE 0x10 +#define FALLOC_FL_INSERT_RANGE 0x20 +#define FALLOC_FL_WRITE_ZEROES 0x40 +#define FALLOC_FL_ALLOCATE_RANGE 0x80 +#define FALLOC_FL_MODE_MASK 0xff + /* Directory entry types */ #define DT_UNKNOWN 0 #define DT_FIFO 1 -- 2.43.0