Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1727063
| From | Ross Zwisler <ross.zwisler@linux.intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 1/9] ext4: remove duplicate extended attributes defs |
| Date | 2017-09-06 00:40 +0200 |
| Message-ID | <umuFJ-AY-39@gated-at.bofh.it> (permalink) |
| References | <umuFH-AY-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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>
Cc: Li Xi <lixi@ddn.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Andreas Dilger <adilger@dilger.ca>
Cc: Jan Kara <jack@suse.cz>
Cc: Dave Chinner <dchinner@redhat.com>
---
fs/ext4/ext4.h | 37 -------------------------------------
1 file changed, 37 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index a2bb7d2..c950278 100644
--- 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
--
2.9.5
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/9] add ext4 per-inode DAX flag Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-06 00:40 +0200
[PATCH 9/9] ext4: add per-inode DAX flag Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-06 00:40 +0200
[PATCH 2/9] xfs: always use DAX if mount option is used Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-06 00:40 +0200
[PATCH 4/9] ext4: add ext4_should_use_dax() Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-06 00:40 +0200
[PATCH 8/9] ext4: add sanity check for encryption + DAX Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-06 00:40 +0200
[PATCH 5/9] ext4: ext4_change_inode_journal_flag error handling Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-06 00:40 +0200
[PATCH 7/9] ext4: prevent data corruption with inline data + DAX Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-06 00:40 +0200
Re: [PATCH 7/9] ext4: prevent data corruption with inline data + DAX Andreas Dilger <adilger@dilger.ca> - 2017-09-06 23:00 +0200
Re: [PATCH 7/9] ext4: prevent data corruption with inline data + DAX Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-07 01:20 +0200
[PATCH 1/9] ext4: remove duplicate extended attributes defs Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-06 00:40 +0200
Re: [PATCH 1/9] ext4: remove duplicate extended attributes defs Jan Kara <jack@suse.cz> - 2017-09-06 09:30 +0200
[PATCH 6/9] ext4: safely transition S_DAX on journaling changes Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-06 00:40 +0200
Re: [PATCH 6/9] ext4: safely transition S_DAX on journaling changes Jan Kara <jack@suse.cz> - 2017-09-06 11:50 +0200
Re: [PATCH 6/9] ext4: safely transition S_DAX on journaling changes Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-06 19:10 +0200
Re: [PATCH 0/9] add ext4 per-inode DAX flag Eric Sandeen <esandeen@redhat.com> - 2017-09-06 04:20 +0200
Re: [PATCH 0/9] add ext4 per-inode DAX flag Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-06 19:10 +0200
Re: [PATCH 0/9] add ext4 per-inode DAX flag Dan Williams <dan.j.williams@intel.com> - 2017-09-07 23:00 +0200
Re: [PATCH 0/9] add ext4 per-inode DAX flag Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-07 23:20 +0200
Re: [PATCH 0/9] add ext4 per-inode DAX flag Andreas Dilger <adilger@dilger.ca> - 2017-09-07 23:30 +0200
Re: [PATCH 0/9] add ext4 per-inode DAX flag Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-08 00:00 +0200
Re: [PATCH 0/9] add ext4 per-inode DAX flag Ross Zwisler <ross.zwisler@linux.intel.com> - 2017-09-08 00:20 +0200
Re: [PATCH 0/9] add ext4 per-inode DAX flag Dave Chinner <david@fromorbit.com> - 2017-09-08 01:30 +0200
Re: [PATCH 0/9] add ext4 per-inode DAX flag Jan Kara <jack@suse.cz> - 2017-09-08 11:50 +0200
Re: [PATCH 0/9] add ext4 per-inode DAX flag Theodore Ts'o <tytso@mit.edu> - 2017-09-08 17:40 +0200
Re: [PATCH 0/9] add ext4 per-inode DAX flag Dave Chinner <david@fromorbit.com> - 2017-09-08 00:20 +0200
csiph-web