2017-01-04 21:36:11

by Liu Bo

Subject: [PATCH] Ext4: cleanup fsxattr related stuff

These definitions have made themselves into include/uapi/linux/fs.h.

Signed-off-by: Liu Bo <[email protected]>
---
fs/ext4/ext4.h | 37 -------------------------------------
1 file changed, 37 deletions(-)

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 2163c1e..11f59a0 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -639,43 +639,6 @@ enum {
#define EXT4_IOC_GET_ENCRYPTION_PWSALT FS_IOC_GET_ENCRYPTION_PWSALT
#define EXT4_IOC_GET_ENCRYPTION_POLICY FS_IOC_GET_ENCRYPTION_POLICY

-#ifndef FS_IOC_FSGETXATTR
-/* Until the uapi changes get merged for project quota... */
-
-#define FS_IOC_FSGETXATTR _IOR('X', 31, struct fsxattr)
-#define FS_IOC_FSSETXATTR _IOW('X', 32, struct fsxattr)
-
-/*
- * Structure for FS_IOC_FSGETXATTR and FS_IOC_FSSETXATTR.
- */
-struct fsxattr {
- __u32 fsx_xflags; /* xflags field value (get/set) */
- __u32 fsx_extsize; /* extsize field value (get/set)*/
- __u32 fsx_nextents; /* nextents field value (get) */
- __u32 fsx_projid; /* project identifier (get/set) */
- unsigned char fsx_pad[12];
-};
-
-/*
- * Flags for the fsx_xflags field
- */
-#define FS_XFLAG_REALTIME 0x00000001 /* data in realtime volume */
-#define FS_XFLAG_PREALLOC 0x00000002 /* preallocated file extents */
-#define FS_XFLAG_IMMUTABLE 0x00000008 /* file cannot be modified */
-#define FS_XFLAG_APPEND 0x00000010 /* all writes append */
-#define FS_XFLAG_SYNC 0x00000020 /* all writes synchronous */
-#define FS_XFLAG_NOATIME 0x00000040 /* do not update access time */
-#define FS_XFLAG_NODUMP 0x00000080 /* do not include in backups */
-#define FS_XFLAG_RTINHERIT 0x00000100 /* create with rt bit set */
-#define FS_XFLAG_PROJINHERIT 0x00000200 /* create with parents projid */
-#define FS_XFLAG_NOSYMLINKS 0x00000400 /* disallow symlink creation */
-#define FS_XFLAG_EXTSIZE 0x00000800 /* extent size allocator hint */
-#define FS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
-#define FS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
-#define FS_XFLAG_FILESTREAM 0x00004000 /* use filestream allocator */
-#define FS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
-#endif /* !defined(FS_IOC_FSGETXATTR) */

2017-01-04 21:51:28

by Darrick J. Wong

Subject: Re: [PATCH] Ext4: cleanup fsxattr related stuff

On Wed, Jan 04, 2017 at 01:43:45PM -0800, Liu Bo wrote:
> These definitions have made themselves into include/uapi/linux/fs.h.
>
> Signed-off-by: Liu Bo <[email protected]>

Not to mention the flag set is already behind the VFS version. :)
Reviewed-by: Darrick J. Wong <[email protected]>

> ---
> fs/ext4/ext4.h | 37 -------------------------------------
> 1 file changed, 37 deletions(-)
>
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index 2163c1e..11f59a0 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -639,43 +639,6 @@ enum {
> #define EXT4_IOC_GET_ENCRYPTION_PWSALT FS_IOC_GET_ENCRYPTION_PWSALT
> #define EXT4_IOC_GET_ENCRYPTION_POLICY FS_IOC_GET_ENCRYPTION_POLICY
>
> -#ifndef FS_IOC_FSGETXATTR
> -/* Until the uapi changes get merged for project quota... */
> -
> -#define FS_IOC_FSGETXATTR _IOR('X', 31, struct fsxattr)
> -#define FS_IOC_FSSETXATTR _IOW('X', 32, struct fsxattr)
> -
> -/*
> - * Structure for FS_IOC_FSGETXATTR and FS_IOC_FSSETXATTR.
> - */
> -struct fsxattr {
> - __u32 fsx_xflags; /* xflags field value (get/set) */
> - __u32 fsx_extsize; /* extsize field value (get/set)*/
> - __u32 fsx_nextents; /* nextents field value (get) */
> - __u32 fsx_projid; /* project identifier (get/set) */
> - unsigned char fsx_pad[12];
> -};
> -
> -/*
> - * Flags for the fsx_xflags field
> - */
> -#define FS_XFLAG_REALTIME 0x00000001 /* data in realtime volume */
> -#define FS_XFLAG_PREALLOC 0x00000002 /* preallocated file extents */
> -#define FS_XFLAG_IMMUTABLE 0x00000008 /* file cannot be modified */
> -#define FS_XFLAG_APPEND 0x00000010 /* all writes append */
> -#define FS_XFLAG_SYNC 0x00000020 /* all writes synchronous */
> -#define FS_XFLAG_NOATIME 0x00000040 /* do not update access time */
> -#define FS_XFLAG_NODUMP 0x00000080 /* do not include in backups */
> -#define FS_XFLAG_RTINHERIT 0x00000100 /* create with rt bit set */
> -#define FS_XFLAG_PROJINHERIT 0x00000200 /* create with parents projid */
> -#define FS_XFLAG_NOSYMLINKS 0x00000400 /* disallow symlink creation */
> -#define FS_XFLAG_EXTSIZE 0x00000800 /* extent size allocator hint */
> -#define FS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
> -#define FS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
> -#define FS_XFLAG_FILESTREAM 0x00004000 /* use filestream allocator */
> -#define FS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
> -#endif /* !defined(FS_IOC_FSGETXATTR) */
> -
> #define EXT4_IOC_FSGETXATTR FS_IOC_FSGETXATTR
> #define EXT4_IOC_FSSETXATTR FS_IOC_FSSETXATTR
>
> --
> 2.5.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html