Add CONFIG_EXTENT_FULL compilation flag

[lwext4.git] / lwext4 / ext4_xattr.c

diff --git a/lwext4/ext4_xattr.c b/lwext4/ext4_xattr.c
index 2eb6edf436b56b152235695ccb010ec5d34cb129..db5081513ee906298ecd90572dcbd09befa29d39 100644 (file)
--- a/lwext4/ext4_xattr.c
+++ b/lwext4/ext4_xattr.c
@@ -131,7 +131,7 @@ RB_GENERATE_INTERNAL(ext4_xattr_tree, ext4_xattr_item, node,
                     ext4_xattr_item_cmp, static inline)
 
 static struct ext4_xattr_item *
-ext4_xattr_item_alloc(uint8_t name_index, char *name, size_t name_len)
+ext4_xattr_item_alloc(uint8_t name_index, const char *name, size_t name_len)
 {
        struct ext4_xattr_item *item;
        item = malloc(sizeof(struct ext4_xattr_item) + name_len);
@@ -151,7 +151,7 @@ ext4_xattr_item_alloc(uint8_t name_index, char *name, size_t name_len)
 }
 
 static int ext4_xattr_item_alloc_data(struct ext4_xattr_item *item,
-                                     void *orig_data, size_t data_size)
+                                     const void *orig_data, size_t data_size)
 {
        void *data = NULL;
        ext4_assert(!item->data);
@@ -350,11 +350,11 @@ static int ext4_xattr_fetch(struct ext4_xattr_ref *xattr_ref)
 
 static struct ext4_xattr_item *
 ext4_xattr_lookup_item(struct ext4_xattr_ref *xattr_ref, uint8_t name_index,
-                      char *name, size_t name_len)
+                      const char *name, size_t name_len)
 {
        struct ext4_xattr_item tmp = {
                .name_index = name_index,
-               .name = name,
+               .name = (char *)name, /*RB_FIND - won't touch this string*/
                .name_len = name_len,
        };
 
@@ -363,7 +363,7 @@ ext4_xattr_lookup_item(struct ext4_xattr_ref *xattr_ref, uint8_t name_index,
 
 static struct ext4_xattr_item *
 ext4_xattr_insert_item(struct ext4_xattr_ref *xattr_ref, uint8_t name_index,
-                      char *name, size_t name_len, void *data,
+                      const char *name, size_t name_len, const void *data,
                       size_t data_size)
 {
        struct ext4_xattr_item *item;
@@ -371,11 +371,18 @@ ext4_xattr_insert_item(struct ext4_xattr_ref *xattr_ref, uint8_t name_index,
        if (!item)
                return NULL;
 
-       if (xattr_ref->ea_size + EXT4_XATTR_SIZE(item->data_size) +
+       if ((xattr_ref->ea_size + EXT4_XATTR_SIZE(data_size) +
+               EXT4_XATTR_LEN(item->name_len)
+                       >
+           ext4_xattr_inode_space(xattr_ref) -
+               sizeof(struct ext4_xattr_ibody_header))
+               &&
+           (xattr_ref->ea_size + EXT4_XATTR_SIZE(data_size) +
                EXT4_XATTR_LEN(item->name_len) >
-           ext4_xattr_inode_space(xattr_ref) +
-               ext4_xattr_block_space(xattr_ref)) {
+           ext4_xattr_block_space(xattr_ref) -
+               sizeof(struct ext4_xattr_header))) {
                ext4_xattr_item_free(item);
+
                return NULL;
        }
        if (ext4_xattr_item_alloc_data(item, data, data_size) != EOK) {
@@ -390,7 +397,7 @@ ext4_xattr_insert_item(struct ext4_xattr_ref *xattr_ref, uint8_t name_index,
 }
 
 static int ext4_xattr_remove_item(struct ext4_xattr_ref *xattr_ref,
-                                 uint8_t name_index, char *name,
+                                 uint8_t name_index, const char *name,
                                  size_t name_len)
 {
        int ret = ENOENT;
@@ -401,10 +408,11 @@ static int ext4_xattr_remove_item(struct ext4_xattr_ref *xattr_ref,
                        xattr_ref->iter_from =
                            RB_NEXT(ext4_xattr_tree, &xattr_ref->root, item);
 
-               RB_REMOVE(ext4_xattr_tree, &xattr_ref->root, item);
-               ext4_xattr_item_free(item);
                xattr_ref->ea_size -= EXT4_XATTR_SIZE(item->data_size) +
                                      EXT4_XATTR_LEN(item->name_len);
+
+               RB_REMOVE(ext4_xattr_tree, &xattr_ref->root, item);
+               ext4_xattr_item_free(item);
                xattr_ref->dirty = true;
                ret = EOK;
        }
@@ -416,10 +424,18 @@ static int ext4_xattr_resize_item(struct ext4_xattr_ref *xattr_ref,
                                  size_t new_data_size)
 {
        int ret = EOK;
-       if (xattr_ref->ea_size - EXT4_XATTR_SIZE(item->data_size) +
-               EXT4_XATTR_SIZE(new_data_size) >
-           ext4_xattr_inode_space(xattr_ref) +
-               ext4_xattr_block_space(xattr_ref)) {
+       size_t old_data_size = item->data_size;
+       if ((xattr_ref->ea_size - EXT4_XATTR_SIZE(old_data_size) +
+               EXT4_XATTR_SIZE(new_data_size)
+                       >
+           ext4_xattr_inode_space(xattr_ref) -
+               sizeof(struct ext4_xattr_ibody_header))
+               &&
+           (xattr_ref->ea_size - EXT4_XATTR_SIZE(old_data_size) +
+               EXT4_XATTR_SIZE(new_data_size)
+                       >
+           ext4_xattr_block_space(xattr_ref) -
+               sizeof(struct ext4_xattr_header))) {
 
                return ENOSPC;
        }
@@ -427,8 +443,10 @@ static int ext4_xattr_resize_item(struct ext4_xattr_ref *xattr_ref,
        if (ret != EOK) {
                return ret;
        }
-       xattr_ref->ea_size -=
-           EXT4_XATTR_SIZE(item->data_size) + EXT4_XATTR_SIZE(new_data_size);
+       xattr_ref->ea_size =
+           xattr_ref->ea_size -
+           EXT4_XATTR_SIZE(old_data_size) +
+           EXT4_XATTR_SIZE(new_data_size);
        xattr_ref->dirty = true;
        return ret;
 }
@@ -436,20 +454,12 @@ static int ext4_xattr_resize_item(struct ext4_xattr_ref *xattr_ref,
 static void ext4_xattr_purge_items(struct ext4_xattr_ref *xattr_ref)
 {
        struct ext4_xattr_item *item, *save_item;
-       uint64_t xattr_block = ext4_inode_get_file_acl(
-           xattr_ref->inode_ref->inode, &xattr_ref->fs->sb);
        RB_FOREACH_SAFE(item, ext4_xattr_tree, &xattr_ref->root, save_item)
        {
                RB_REMOVE(ext4_xattr_tree, &xattr_ref->root, item);
                ext4_xattr_item_free(item);
        }
        xattr_ref->ea_size = 0;
-       if (xattr_block)
-               xattr_ref->ea_size += sizeof(struct ext4_xattr_header);
-
-       if (ext4_xattr_inode_space(xattr_ref) >
-           sizeof(struct ext4_xattr_ibody_header))
-               xattr_ref->ea_size += sizeof(struct ext4_xattr_ibody_header);
 }
 
 static int ext4_xattr_try_alloc_block(struct ext4_xattr_ref *xattr_ref)
@@ -477,7 +487,6 @@ static int ext4_xattr_try_alloc_block(struct ext4_xattr_ref *xattr_ref)
                                        &xattr_ref->fs->sb, xattr_block);
                xattr_ref->inode_ref->dirty = true;
                xattr_ref->block_loaded = true;
-               xattr_ref->ea_size += sizeof(struct ext4_xattr_header);
        }
 
 Finish:
@@ -495,7 +504,6 @@ static void ext4_xattr_try_free_block(struct ext4_xattr_ref *xattr_ref)
        ext4_balloc_free_block(xattr_ref->inode_ref, xattr_block);
        xattr_ref->inode_ref->dirty = true;
        xattr_ref->block_loaded = false;
-       xattr_ref->ea_size -= sizeof(struct ext4_xattr_header);
 }
 
 static void ext4_xattr_set_block_header(struct ext4_xattr_ref *xattr_ref)
@@ -683,15 +691,15 @@ void ext4_fs_xattr_iterate_reset(struct ext4_xattr_ref *ref)
 }
 
 int ext4_fs_set_xattr(struct ext4_xattr_ref *ref, uint8_t name_index,
-                     char *name, size_t name_len, void *data, size_t data_size,
-                     bool replace)
+                     const char *name, size_t name_len, const void *data,
+                     size_t data_size, bool replace)
 {
        int ret = EOK;
        struct ext4_xattr_item *item =
            ext4_xattr_lookup_item(ref, name_index, name, name_len);
        if (replace) {
                if (!item) {
-                       ret = ENOATTR;
+                       ret = ENODATA;
                        goto Finish;
                }
                if (item->data_size != data_size)
@@ -716,13 +724,13 @@ Finish:
 }
 
 int ext4_fs_remove_xattr(struct ext4_xattr_ref *ref, uint8_t name_index,
-                        char *name, size_t name_len)
+                        const char *name, size_t name_len)
 {
        return ext4_xattr_remove_item(ref, name_index, name, name_len);
 }
 
 int ext4_fs_get_xattr(struct ext4_xattr_ref *ref, uint8_t name_index,
-                     char *name, size_t name_len, void *buf, size_t buf_size,
+                     const char *name, size_t name_len, void *buf, size_t buf_size,
                      size_t *data_size)
 {
        int ret = EOK;
@@ -731,7 +739,7 @@ int ext4_fs_get_xattr(struct ext4_xattr_ref *ref, uint8_t name_index,
            ext4_xattr_lookup_item(ref, name_index, name, name_len);
 
        if (!item) {
-               ret = ENOATTR;
+               ret = ENODATA;
                goto Finish;
        }
        item_size = item->data_size;
@@ -762,7 +770,6 @@ int ext4_fs_get_xattr_ref(struct ext4_fs *fs, struct ext4_inode_ref *inode_ref,
                if (rc != EOK)
                        return EIO;
 
-               ref->ea_size += sizeof(struct ext4_xattr_header);
                ref->block_loaded = true;
        } else
                ref->block_loaded = false;
@@ -770,10 +777,6 @@ int ext4_fs_get_xattr_ref(struct ext4_fs *fs, struct ext4_inode_ref *inode_ref,
        ref->inode_ref = inode_ref;
        ref->fs = fs;
 
-       if (ext4_xattr_inode_space(ref) >
-           sizeof(struct ext4_xattr_ibody_header))
-               ref->ea_size += sizeof(struct ext4_xattr_ibody_header);
-
        rc = ext4_xattr_fetch(ref);
        if (rc != EOK) {
                ext4_xattr_purge_items(ref);
@@ -811,7 +814,7 @@ static const struct xattr_prefix prefix_tbl[] = {
     {NULL, 0},
 };
 
-char *ext4_extract_xattr_name(char *full_name, size_t full_name_len,
+const char *ext4_extract_xattr_name(const char *full_name, size_t full_name_len,
                              uint8_t *name_index, size_t *name_len)
 {
        int i;