X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=lwext4%2Fext4_xattr.c;h=14baed8165ae358a927a87f884e287baf1c50037;hb=fe2cde8c8128fff855522a84a8f2864e6ed69686;hp=d50f5cd25cd98946f726dd9683323915054a656d;hpb=765eb290a7700d817076ea633b1ea88ca0a21713;p=lwext4.git

diff --git a/lwext4/ext4_xattr.c b/lwext4/ext4_xattr.c
index d50f5cd..14baed8 100644
--- a/lwext4/ext4_xattr.c
+++ b/lwext4/ext4_xattr.c
@@ -40,7 +40,7 @@
 #include "ext4_errno.h"
 #include "ext4_blockdev.h"
 #include "ext4_super.h"
-#include "ext4_crc32c.h"
+#include "ext4_crc32.h"
 #include "ext4_debug.h"
 #include "ext4_block_group.h"
 #include "ext4_balloc.h"
@@ -163,6 +163,12 @@ static int ext4_xattr_item_cmp(struct ext4_xattr_item *a,
 			       struct ext4_xattr_item *b)
 {
 	int result;
+	if (a->in_inode && !b->in_inode)
+		return -1;
+	
+	if (!a->in_inode && b->in_inode)
+		return 1;
+
 	result = a->name_index - b->name_index;
 	if (result)
 		return result;
@@ -194,6 +200,13 @@ ext4_xattr_item_alloc(uint8_t name_index, const char *name, size_t name_len)
 	memset(&item->node, 0, sizeof(item->node));
 	memcpy(item->name, name, name_len);
 
+	if (name_index == EXT4_XATTR_INDEX_SYSTEM &&
+	    name_len == 4 &&
+	    !memcmp(name, "data", 4))
+		item->in_inode = true;
+	else
+		item->in_inode = false;
+
 	return item;
 }
 
@@ -404,6 +417,10 @@ ext4_xattr_lookup_item(struct ext4_xattr_ref *xattr_ref, uint8_t name_index,
 		.name = (char *)name, /*RB_FIND - won't touch this string*/
 		.name_len = name_len,
 	};
+	if (name_index == EXT4_XATTR_INDEX_SYSTEM &&
+	    name_len == 4 &&
+	    !memcmp(name, "data", 4))
+		tmp.in_inode = true;
 
 	return RB_FIND(ext4_xattr_tree, &xattr_ref->root, &tmp);
 }
@@ -526,7 +543,7 @@ static int ext4_xattr_try_alloc_block(struct ext4_xattr_ref *xattr_ref)
 		if (ret != EOK)
 			goto Finish;
 
-		ret = ext4_block_get(xattr_ref->fs->bdev, &xattr_ref->block,
+		ret = ext4_trans_block_get(xattr_ref->fs->bdev, &xattr_ref->block,
 				     xattr_block);
 		if (ret != EOK) {
 			ext4_balloc_free_block(xattr_ref->inode_ref,
@@ -638,7 +655,7 @@ static int ext4_xattr_write_to_disk(struct ext4_xattr_ref *xattr_ref)
 		block_data = (char *)block_header + block_size_rem;
 		block_size_rem -= sizeof(struct ext4_xattr_header);
 
-		xattr_ref->block.dirty = true;
+		ext4_trans_set_block_dirty(xattr_ref->block.buf);
 	} else {
 		/* We don't need an extra block.*/
 		if (xattr_ref->block_loaded) {
@@ -660,7 +677,7 @@ static int ext4_xattr_write_to_disk(struct ext4_xattr_ref *xattr_ref)
 				    &xattr_ref->fs->sb, 0);
 
 				xattr_ref->inode_ref->dirty = true;
-				xattr_ref->block.dirty = true;
+				ext4_trans_set_block_dirty(xattr_ref->block.buf);
 			}
 		}
 	}
@@ -709,7 +726,7 @@ static int ext4_xattr_write_to_disk(struct ext4_xattr_ref *xattr_ref)
 		ext4_xattr_set_block_checksum(xattr_ref->inode_ref,
 					      xattr_ref->block.lb_id,
 					      block_header);
-		xattr_ref->block.dirty = true;
+		ext4_trans_set_block_dirty(xattr_ref->block.buf);
 	}
 
 Finish:
@@ -784,8 +801,8 @@ int ext4_fs_remove_xattr(struct ext4_xattr_ref *ref, uint8_t name_index,
 }
 
 int ext4_fs_get_xattr(struct ext4_xattr_ref *ref, uint8_t name_index,
-		      const char *name, size_t name_len, void *buf, size_t buf_size,
-		      size_t *data_size)
+		      const char *name, size_t name_len, void *buf,
+		      size_t buf_size, size_t *data_size)
 {
 	int ret = EOK;
 	size_t item_size = 0;
@@ -820,7 +837,7 @@ int ext4_fs_get_xattr_ref(struct ext4_fs *fs, struct ext4_inode_ref *inode_ref,
 	ref->ea_size = 0;
 	ref->iter_from = NULL;
 	if (xattr_block) {
-		rc = ext4_block_get(fs->bdev, &ref->block, xattr_block);
+		rc = ext4_trans_block_get(fs->bdev, &ref->block, xattr_block);
 		if (rc != EOK)
 			return EIO;
 
@@ -862,9 +879,12 @@ struct xattr_prefix {
 
 static const struct xattr_prefix prefix_tbl[] = {
     {"user.", EXT4_XATTR_INDEX_USER},
-    {"system.", EXT4_XATTR_INDEX_SYSTEM},
     {"system.posix_acl_access", EXT4_XATTR_INDEX_POSIX_ACL_ACCESS},
     {"system.posix_acl_default", EXT4_XATTR_INDEX_POSIX_ACL_DEFAULT},
+    {"trusted.", EXT4_XATTR_INDEX_TRUSTED},
+    {"security.", EXT4_XATTR_INDEX_SECURITY},
+    {"system.", EXT4_XATTR_INDEX_SYSTEM},
+    {"system.richacl", EXT4_XATTR_INDEX_RICHACL},
     {NULL, 0},
 };
 
@@ -897,7 +917,8 @@ const char *ext4_extract_xattr_name(const char *full_name, size_t full_name_len,
 	return NULL;
 }
 
-const char *ext4_get_xattr_name_prefix(uint8_t name_index, size_t *ret_prefix_len)
+const char *ext4_get_xattr_name_prefix(uint8_t name_index,
+				       size_t *ret_prefix_len)
 {
 	int i;