summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL3
-rw-r--r--btrfs-convert.c15
2 files changed, 15 insertions, 3 deletions
diff --git a/INSTALL b/INSTALL
index cc482177..f8d719a0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -17,10 +17,9 @@ Generating documentation:
- asciidoc - text document format tool
- xmlto - text document format tool
-XATTR and ACL libraries should be provided by the standard C library or by
+XATTR library should be provided by the standard C library or by
- libattr - extended attribute library
-- libacl - access control list library
Please note that the package names may differ according to the distribution.
See https://btrfs.wiki.kernel.org/index.php/Btrfs_source_repositories#Dependencies .
diff --git a/btrfs-convert.c b/btrfs-convert.c
index f9dd7346..9a9d6196 100644
--- a/btrfs-convert.c
+++ b/btrfs-convert.c
@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/acl.h>
#include <fcntl.h>
#include <unistd.h>
#include <uuid/uuid.h>
@@ -692,6 +691,20 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry,
#define EXT2_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;