ext4_blockdev: add ext4_block_flush_lba routine.

[lwext4.git] / lwext4 / ext4_xattr.c

diff --git a/lwext4/ext4_xattr.c b/lwext4/ext4_xattr.c
index e4e19fb39c4820d08b58e0a583b33a8eeb2b8b2a..b446d629d4cb2ab025a1ef503e96cf07bdd0afd3 100644 (file)
--- a/lwext4/ext4_xattr.c
+++ b/lwext4/ext4_xattr.c
@@ -40,11 +40,11 @@
 #include "ext4_errno.h"
 #include "ext4_blockdev.h"
 #include "ext4_super.h"
+#include "ext4_crc32c.h"
 #include "ext4_debug.h"
 #include "ext4_block_group.h"
 #include "ext4_balloc.h"
 #include "ext4_inode.h"
-#include "ext4_extent.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -112,10 +112,63 @@ static void ext4_xattr_rehash(struct ext4_xattr_header *header,
        header->h_hash = to_le32(hash);
 }
 
+#if CONFIG_META_CSUM_ENABLE
+static uint32_t
+ext4_xattr_block_checksum(struct ext4_inode_ref *inode_ref,
+                         ext4_fsblk_t blocknr,
+                         struct ext4_xattr_header *header)
+{
+       uint32_t checksum = 0;
+       uint64_t le64_blocknr = blocknr;
+       struct ext4_sblock *sb = &inode_ref->fs->sb;
+
+       if (ext4_sb_feature_ro_com(sb, EXT4_FRO_COM_METADATA_CSUM)) {
+               uint32_t orig_checksum;
+
+               /* Preparation: temporarily set bg checksum to 0 */
+               orig_checksum = header->h_checksum;
+               header->h_checksum = 0;
+               /* First calculate crc32 checksum against fs uuid */
+               checksum = ext4_crc32c(EXT4_CRC32_INIT, sb->uuid,
+                               sizeof(sb->uuid));
+               /* Then calculate crc32 checksum block number */
+               checksum = ext4_crc32c(checksum, &le64_blocknr,
+                                    sizeof(le64_blocknr));
+               /* Finally calculate crc32 checksum against 
+                * the entire xattr block */
+               checksum = ext4_crc32c(checksum, header,
+                                  ext4_sb_get_block_size(sb));
+               header->h_checksum = orig_checksum;
+       }
+       return checksum;
+}
+#else
+#define ext4_xattr_block_checksum(...) 0
+#endif
+
+static void
+ext4_xattr_set_block_checksum(struct ext4_inode_ref *inode_ref,
+                             ext4_fsblk_t blocknr __unused,
+                             struct ext4_xattr_header *header)
+{
+       struct ext4_sblock *sb = &inode_ref->fs->sb;
+       if (!ext4_sb_feature_ro_com(sb, EXT4_FRO_COM_METADATA_CSUM))
+               return;
+
+       header->h_checksum =
+               ext4_xattr_block_checksum(inode_ref, blocknr, header);
+}
+
 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;
@@ -147,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;
 }
 
@@ -357,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);
 }
@@ -466,12 +530,16 @@ static int ext4_xattr_try_alloc_block(struct ext4_xattr_ref *xattr_ref)
 {
        int ret = EOK;
 
-       uint64_t xattr_block = 0;
+       ext4_fsblk_t xattr_block = 0;
        xattr_block = ext4_inode_get_file_acl(xattr_ref->inode_ref->inode,
                                              &xattr_ref->fs->sb);
        if (!xattr_block) {
+               ext4_fsblk_t goal =
+                       ext4_fs_inode_to_goal_block(xattr_ref->inode_ref);
+
                ret = ext4_balloc_alloc_block(xattr_ref->inode_ref,
-                                             (uint32_t *)&xattr_block);
+                                             goal,
+                                             &xattr_block);
                if (ret != EOK)
                        goto Finish;
 
@@ -495,7 +563,7 @@ Finish:
 
 static void ext4_xattr_try_free_block(struct ext4_xattr_ref *xattr_ref)
 {
-       uint64_t xattr_block;
+       ext4_fsblk_t xattr_block;
        xattr_block = ext4_inode_get_file_acl(xattr_ref->inode_ref->inode,
                                              &xattr_ref->fs->sb);
        ext4_inode_set_file_acl(xattr_ref->inode_ref->inode, &xattr_ref->fs->sb,
@@ -587,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_bcache_set_dirty(xattr_ref->block.buf);
        } else {
                /* We don't need an extra block.*/
                if (xattr_ref->block_loaded) {
@@ -609,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_bcache_set_dirty(xattr_ref->block.buf);
                        }
                }
        }
@@ -655,7 +723,10 @@ static int ext4_xattr_write_to_disk(struct ext4_xattr_ref *xattr_ref)
        if (block_modified) {
                ext4_xattr_rehash(block_header,
                                  EXT4_XATTR_BFIRST(&xattr_ref->block));
-               xattr_ref->block.dirty = true;
+               ext4_xattr_set_block_checksum(xattr_ref->inode_ref,
+                                             xattr_ref->block.lb_id,
+                                             block_header);
+               ext4_bcache_set_dirty(xattr_ref->block.buf);
        }
 
 Finish:
@@ -699,7 +770,7 @@ int ext4_fs_set_xattr(struct ext4_xattr_ref *ref, uint8_t name_index,
            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)
@@ -730,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;
@@ -739,7 +810,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;
@@ -760,7 +831,7 @@ int ext4_fs_get_xattr_ref(struct ext4_fs *fs, struct ext4_inode_ref *inode_ref,
                          struct ext4_xattr_ref *ref)
 {
        int rc;
-       uint64_t xattr_block;
+       ext4_fsblk_t xattr_block;
        xattr_block = ext4_inode_get_file_acl(inode_ref->inode, &fs->sb);
        RB_INIT(&ref->root);
        ref->ea_size = 0;
@@ -808,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},
 };
 
@@ -843,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;