The inode flags defined in uapi/linux/fs.h were migrated from
ext4.h. This patch changes the inode flag definitions in ext4.h
to VFS definitions to make the gaps between them clearer.
Signed-off-by: Li Xi <[email protected]>
---
fs/ext4/ext4.h | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 43a2a88..bcc04c0 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -353,33 +353,33 @@ struct flex_groups {
/*
* Inode flags
*/
-#define EXT4_SECRM_FL 0x00000001 /* Secure deletion */
-#define EXT4_UNRM_FL 0x00000002 /* Undelete */
-#define EXT4_COMPR_FL 0x00000004 /* Compress file */
-#define EXT4_SYNC_FL 0x00000008 /* Synchronous updates */
-#define EXT4_IMMUTABLE_FL 0x00000010 /* Immutable file */
-#define EXT4_APPEND_FL 0x00000020 /* writes to file may only append */
-#define EXT4_NODUMP_FL 0x00000040 /* do not dump file */
-#define EXT4_NOATIME_FL 0x00000080 /* do not update atime */
+#define EXT4_SECRM_FL FS_SECRM_FL /* Secure deletion */
+#define EXT4_UNRM_FL FS_UNRM_FL /* Undelete */
+#define EXT4_COMPR_FL FS_COMPR_FL /* Compress file */
+#define EXT4_SYNC_FL FS_SYNC_FL /* Synchronous updates */
+#define EXT4_IMMUTABLE_FL FS_IMMUTABLE_FL /* Immutable file */
+#define EXT4_APPEND_FL FS_APPEND_FL /* writes to file may only append */
+#define EXT4_NODUMP_FL FS_NODUMP_FL /* do not dump file */
+#define EXT4_NOATIME_FL FS_NOATIME_FL /* do not update atime */
/* Reserved for compression usage... */
-#define EXT4_DIRTY_FL 0x00000100
-#define EXT4_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */
-#define EXT4_NOCOMPR_FL 0x00000400 /* Don't compress */
-#define EXT4_ECOMPR_FL 0x00000800 /* Compression error */
+#define EXT4_DIRTY_FL FS_DIRTY_FL
+#define EXT4_COMPRBLK_FL FS_COMPRBLK_FL /* One or more compressed clusters */
+#define EXT4_NOCOMPR_FL FS_NOCOMP_FL /* Don't compress */
+#define EXT4_ECOMPR_FL FS_ECOMPR_FL /* Compression error */
/* End compression flags --- maybe not all used */
-#define EXT4_INDEX_FL 0x00001000 /* hash-indexed directory */
-#define EXT4_IMAGIC_FL 0x00002000 /* AFS directory */
-#define EXT4_JOURNAL_DATA_FL 0x00004000 /* file data should be journaled */
-#define EXT4_NOTAIL_FL 0x00008000 /* file tail should not be merged */
-#define EXT4_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
-#define EXT4_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
-#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */
-#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
-#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
-#define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */
-#define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data. */
-#define EXT4_PROJINHERIT_FL FS_PROJINHERIT_FL /* Create with parents projid */
-#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
+#define EXT4_INDEX_FL FS_INDEX_FL /* hash-indexed directory */
+#define EXT4_IMAGIC_FL FS_IMAGIC_FL /* AFS directory */
+#define EXT4_JOURNAL_DATA_FL FS_JOURNAL_DATA_FL /* file data should be journaled */
+#define EXT4_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
+#define EXT4_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
+#define EXT4_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
+#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */
+#define EXT4_EXTENTS_FL FS_EXTENT_FL /* Inode uses extents */
+#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
+#define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */
+#define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data. */
+#define EXT4_PROJINHERIT_FL FS_PROJINHERIT_FL /* Create with parents projid */
+#define EXT4_RESERVED_FL FS_RESERVED_FL /* reserved for ext4 lib */
#define EXT4_FL_USER_VISIBLE 0x204BDFFF /* User visible flags */
#define EXT4_FL_USER_MODIFIABLE 0x204380FF /* User modifiable flags */
--
1.7.1
On Dec 8, 2014, at 10:22 PM, Li Xi <[email protected]> wrote:
>
> The inode flags defined in uapi/linux/fs.h were migrated from
> ext4.h. This patch changes the inode flag definitions in ext4.h
> to VFS definitions to make the gaps between them clearer.
>
> Signed-off-by: Li Xi <[email protected]>
Reviewed-by: Andreas Dilger <[email protected]>
> ---
> fs/ext4/ext4.h | 50 +++++++++++++++++++++++++-------------------------
> 1 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index 43a2a88..bcc04c0 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -353,33 +353,33 @@ struct flex_groups {
> /*
> * Inode flags
> */
> -#define EXT4_SECRM_FL 0x00000001 /* Secure deletion */
> -#define EXT4_UNRM_FL 0x00000002 /* Undelete */
> -#define EXT4_COMPR_FL 0x00000004 /* Compress file */
> -#define EXT4_SYNC_FL 0x00000008 /* Synchronous updates */
> -#define EXT4_IMMUTABLE_FL 0x00000010 /* Immutable file */
> -#define EXT4_APPEND_FL 0x00000020 /* writes to file may only append */
> -#define EXT4_NODUMP_FL 0x00000040 /* do not dump file */
> -#define EXT4_NOATIME_FL 0x00000080 /* do not update atime */
> +#define EXT4_SECRM_FL FS_SECRM_FL /* Secure deletion */
> +#define EXT4_UNRM_FL FS_UNRM_FL /* Undelete */
> +#define EXT4_COMPR_FL FS_COMPR_FL /* Compress file */
> +#define EXT4_SYNC_FL FS_SYNC_FL /* Synchronous updates */
> +#define EXT4_IMMUTABLE_FL FS_IMMUTABLE_FL /* Immutable file */
> +#define EXT4_APPEND_FL FS_APPEND_FL /* writes to file may only append */
> +#define EXT4_NODUMP_FL FS_NODUMP_FL /* do not dump file */
> +#define EXT4_NOATIME_FL FS_NOATIME_FL /* do not update atime */
> /* Reserved for compression usage... */
> -#define EXT4_DIRTY_FL 0x00000100
> -#define EXT4_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */
> -#define EXT4_NOCOMPR_FL 0x00000400 /* Don't compress */
> -#define EXT4_ECOMPR_FL 0x00000800 /* Compression error */
> +#define EXT4_DIRTY_FL FS_DIRTY_FL
> +#define EXT4_COMPRBLK_FL FS_COMPRBLK_FL /* One or more compressed clusters */
> +#define EXT4_NOCOMPR_FL FS_NOCOMP_FL /* Don't compress */
> +#define EXT4_ECOMPR_FL FS_ECOMPR_FL /* Compression error */
> /* End compression flags --- maybe not all used */
> -#define EXT4_INDEX_FL 0x00001000 /* hash-indexed directory */
> -#define EXT4_IMAGIC_FL 0x00002000 /* AFS directory */
> -#define EXT4_JOURNAL_DATA_FL 0x00004000 /* file data should be journaled */
> -#define EXT4_NOTAIL_FL 0x00008000 /* file tail should not be merged */
> -#define EXT4_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
> -#define EXT4_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
> -#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */
> -#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
> -#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
> -#define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */
> -#define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data. */
> -#define EXT4_PROJINHERIT_FL FS_PROJINHERIT_FL /* Create with parents projid */
> -#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
> +#define EXT4_INDEX_FL FS_INDEX_FL /* hash-indexed directory */
> +#define EXT4_IMAGIC_FL FS_IMAGIC_FL /* AFS directory */
> +#define EXT4_JOURNAL_DATA_FL FS_JOURNAL_DATA_FL /* file data should be journaled */
> +#define EXT4_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
> +#define EXT4_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
> +#define EXT4_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
> +#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */
> +#define EXT4_EXTENTS_FL FS_EXTENT_FL /* Inode uses extents */
> +#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
> +#define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */
> +#define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data. */
> +#define EXT4_PROJINHERIT_FL FS_PROJINHERIT_FL /* Create with parents projid */
> +#define EXT4_RESERVED_FL FS_RESERVED_FL /* reserved for ext4 lib */
>
> #define EXT4_FL_USER_VISIBLE 0x204BDFFF /* User visible flags */
> #define EXT4_FL_USER_MODIFIABLE 0x204380FF /* User modifiable flags */
> --
> 1.7.1
>
Cheers, Andreas