fixup! fixup! feat: add 'allocated' flag to inode data block

Author: AdamStepan

src/ex.c

@@ -124,6 +124,8 @@ int ex_getattr(const char *pathname, struct stat *st) {
 
     st->st_nlink = inode->nlinks;
     st->st_size = inode->size;
+    st->st_blocks = inode->nblocks;
+    st->st_blksize = EX_BLOCK_SIZE;
     st->st_mode = inode->mode;
     st->st_ino = inode->number;
 

src/inode.c

@@ -68,6 +68,7 @@ ex_status ex_inode_allocate_blocks(struct ex_inode *inode) {
 
         struct ex_data_block *block = &inode->blocks[i];
 
+        inode->nblocks += 1;
         block->address = address;
         block->allocated = 1;
     }
@@ -99,6 +100,7 @@ void ex_inode_print(const struct ex_inode *inode) {
     info("address: %lu", inode->address);
     info("links: %u", inode->nlinks);
     info("size: %lu", inode->size);
+    info("nblocks: %lu", inode->nblocks);
 
     info("uid: %u", inode->uid);
     info("gid: %u", inode->gid);
@@ -140,6 +142,8 @@ struct ex_inode *ex_copy_inode(const struct ex_inode *inode) {
     copy->gid = inode->gid;
     copy->uid = inode->uid;
 
+    copy->nblocks = inode->nblocks;
+
     for (size_t i = 0; i < EX_DIRECT_BLOCKS; i++) {
         copy->blocks[i] = inode->blocks[i];
     }
@@ -183,6 +187,8 @@ ex_status ex_inode_create(struct ex_inode *inode, uint16_t mode, gid_t gid, uid_
         inode->nlinks = 1;
     }
 
+    inode->nblocks = 0;
+
     if (ex_inode_allocate_blocks(inode) != OK) {
         goto free_inode_block;
     }

src/inode.h

@@ -50,6 +50,9 @@ struct ex_inode {
     // number of links
     uint16_t nlinks;
 
+    // number of allocated blocks
+    size_t nblocks;
+
     // size of file when inode is file
     // size of file metadata (struct ex_inode) if inode is directory
     size_t size;

test/CMakeLists.txt

@@ -20,6 +20,7 @@ set(TEST_SOURCES
     test_write_max_size.c
     test_chmod.c
     test_chown.c
+    test_stat_block_number.c
 )
 
 find_package(PkgConfig REQUIRED)

test/test_main.c

@@ -21,6 +21,7 @@ void test_can_create_maximum_inodes(void);
 void test_inode_link(void);
 void test_chmod(void);
 void test_chown(void);
+void test_stat_block_number(void);
 
 int main(int argc, char **argv) {
     ex_set_log_level(fatal);
@@ -52,6 +53,7 @@ int main(int argc, char **argv) {
     g_test_add_func("/exfuse/test_inode_link", test_inode_link);
     g_test_add_func("/exfuse/test_chmod", test_chmod);
     g_test_add_func("/exfuse/test_chown", test_chown);
+    g_test_add_func("/exfuse/test_stat_block_number", test_stat_block_number);
 
     return g_test_run();
 }

test/test_stat_block_number.c

@@ -0,0 +1,28 @@
+#include "../src/ex.h"
+#include "../src/mkfs.h"
+#include <err.h>
+#include <glib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+void test_stat_block_number(void) {
+    // create new device
+    unlink(EX_DEVICE);
+    ex_mkfs_test_init();
+
+    // create new file
+    int rv = ex_create("/fname", S_IRWXU, getgid(), getuid());
+    g_assert(!rv);
+
+    struct stat st;
+
+    rv = ex_getattr("/fname", &st);
+    g_assert(!rv);
+
+    // current file should be empty, but because we do preallocate
+    // all direct blocks nblocks should be EX_DIRECT_BLOCKS
+    g_assert_cmpint(st.st_blocks, ==, EX_DIRECT_BLOCKS);
+
+    ex_deinit();
+}