1 ext4: remove duplicate extended attributes defs
3 From: Ross Zwisler <ross.zwisler@linux.intel.com>
7 commit 9b7365fc1c82 ("ext4: add FS_IOC_FSSETXATTR/FS_IOC_FSGETXATTR
10 added several defines related to extended attributes to ext4.h. They were
11 added within an #ifndef FS_IOC_FSGETXATTR block with the comment:
13 /* Until the uapi changes get merged for project quota... */
15 Those uapi changes were merged by this commit:
17 commit 334e580a6f97 ("fs: XFS_IOC_FS[SG]SETXATTR to FS_IOC_FS[SG]ETXATTR
20 so all the definitions needed by ext4 are available in
21 include/uapi/linux/fs.h. Remove the duplicates from ext4.h.
23 Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
24 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
25 Reviewed-by: Jan Kara <jack@suse.cz>
27 fs/ext4/ext4.h | 37 -------------------------------------
28 1 file changed, 37 deletions(-)
30 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
31 index 84b9da1..83a857f 100644
34 @@ -644,43 +644,6 @@ enum {
35 #define EXT4_IOC_GET_ENCRYPTION_PWSALT FS_IOC_GET_ENCRYPTION_PWSALT
36 #define EXT4_IOC_GET_ENCRYPTION_POLICY FS_IOC_GET_ENCRYPTION_POLICY
38 -#ifndef FS_IOC_FSGETXATTR
39 -/* Until the uapi changes get merged for project quota... */
41 -#define FS_IOC_FSGETXATTR _IOR('X', 31, struct fsxattr)
42 -#define FS_IOC_FSSETXATTR _IOW('X', 32, struct fsxattr)
45 - * Structure for FS_IOC_FSGETXATTR and FS_IOC_FSSETXATTR.
48 - __u32 fsx_xflags; /* xflags field value (get/set) */
49 - __u32 fsx_extsize; /* extsize field value (get/set)*/
50 - __u32 fsx_nextents; /* nextents field value (get) */
51 - __u32 fsx_projid; /* project identifier (get/set) */
52 - unsigned char fsx_pad[12];
56 - * Flags for the fsx_xflags field
58 -#define FS_XFLAG_REALTIME 0x00000001 /* data in realtime volume */
59 -#define FS_XFLAG_PREALLOC 0x00000002 /* preallocated file extents */
60 -#define FS_XFLAG_IMMUTABLE 0x00000008 /* file cannot be modified */
61 -#define FS_XFLAG_APPEND 0x00000010 /* all writes append */
62 -#define FS_XFLAG_SYNC 0x00000020 /* all writes synchronous */
63 -#define FS_XFLAG_NOATIME 0x00000040 /* do not update access time */
64 -#define FS_XFLAG_NODUMP 0x00000080 /* do not include in backups */
65 -#define FS_XFLAG_RTINHERIT 0x00000100 /* create with rt bit set */
66 -#define FS_XFLAG_PROJINHERIT 0x00000200 /* create with parents projid */
67 -#define FS_XFLAG_NOSYMLINKS 0x00000400 /* disallow symlink creation */
68 -#define FS_XFLAG_EXTSIZE 0x00000800 /* extent size allocator hint */
69 -#define FS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
70 -#define FS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
71 -#define FS_XFLAG_FILESTREAM 0x00004000 /* use filestream allocator */
72 -#define FS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
73 -#endif /* !defined(FS_IOC_FSGETXATTR) */
75 #define EXT4_IOC_FSGETXATTR FS_IOC_FSGETXATTR
76 #define EXT4_IOC_FSSETXATTR FS_IOC_FSSETXATTR