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) {
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;
}
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;
}
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;
}
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)
&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:
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)
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)
ext4_xattr_lookup_item(ref, name_index, name, name_len);
if (!item) {
- ret = ENOATTR;
+ ret = ENODATA;
goto Finish;
}
item_size = item->data_size;
if (rc != EOK)
return EIO;
- ref->ea_size += sizeof(struct ext4_xattr_header);
ref->block_loaded = true;
} else
ref->block_loaded = false;
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);