diff options
author | David Sterba <dsterba@suse.com> | 2017-08-22 20:30:43 +0200 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-09-08 16:15:05 +0200 |
commit | 385bbf35e245bfa71c83d6c41e563ce4ed22663e (patch) | |
tree | 1ada646bfa53f8e37de7661990ce67d2726c0f0e /convert/source-reiserfs.h | |
parent | ebf449b521c1a5fb3d1ac07fcdaa00bc316883ae (diff) |
btrfs-progs: convert: move duplicated acl code to common header
The ACL types and macros are same for both source filesystem.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'convert/source-reiserfs.h')
-rw-r--r-- | convert/source-reiserfs.h | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/convert/source-reiserfs.h b/convert/source-reiserfs.h index c960c2b6..10b0ceb6 100644 --- a/convert/source-reiserfs.h +++ b/convert/source-reiserfs.h @@ -29,48 +29,6 @@ #define REISERFS_ACL_VERSION 0x0001 -/* 23.2.5 acl_tag_t values */ - -#define ACL_UNDEFINED_TAG (0x00) -#define ACL_USER_OBJ (0x01) -#define ACL_USER (0x02) -#define ACL_GROUP_OBJ (0x04) -#define ACL_GROUP (0x08) -#define ACL_MASK (0x10) -#define ACL_OTHER (0x20) - -/* 23.2.7 ACL qualifier constants */ - -#define ACL_UNDEFINED_ID ((id_t)-1) - -typedef struct { - __le16 e_tag; - __le16 e_perm; - __le32 e_id; -} ext2_acl_entry; - -typedef struct { - __le16 e_tag; - __le16 e_perm; -} ext2_acl_entry_short; - -typedef struct { - __le32 a_version; -} ext2_acl_header; - -#define ACL_EA_VERSION 0x0002 - -typedef struct { - __le16 e_tag; - __le16 e_perm; - __le32 e_id; -} acl_ea_entry; - -typedef struct { - __le32 a_version; - acl_ea_entry a_entries[0]; -} acl_ea_header; - static inline int ext2_acl_count(size_t size) { ssize_t s; @@ -87,12 +45,6 @@ static inline int ext2_acl_count(size_t size) } } - -static inline size_t acl_ea_size(int count) -{ - return sizeof(acl_ea_header) + count * sizeof(acl_ea_entry); -} - static inline dev_t new_decode_dev(u32 dev) { unsigned major = (dev & 0xfff00) >> 8; |