ext4: remove duplicate extended attributes defs

The following commit:

commit 9b7365fc1c82 ("ext4: add FS_IOC_FSSETXATTR/FS_IOC_FSGETXATTR
interface support")

added several defines related to extended attributes to ext4.h.  They were
added within an #ifndef FS_IOC_FSGETXATTR block with the comment:

/* Until the uapi changes get merged for project quota... */

Those uapi changes were merged by this commit:

commit 334e580a6f97 ("fs: XFS_IOC_FS[SG]SETXATTR to FS_IOC_FS[SG]ETXATTR
promotion")

so all the definitions needed by ext4 are available in
include/uapi/linux/fs.h.  Remove the duplicates from ext4.h.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 6fd1fe7456eb7279d277a8ece1b84b0d912e6664..16bf888b187e14ccd5efa4344b5276805e5f443e 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -644,43 +644,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