Changeset ae3d4f8 in mainline

Timestamp:

2011-11-20T08:35:56Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fe27eb4

Parents:

528e5b3

Message:

superblock update after block (de)allocation

Location:

uspace

Files:

• lib/ext4/libext4_balloc.c (modified) (4 diffs)
• lib/ext4/libext4_filesystem.c (modified) (2 diffs)
• lib/ext4/libext4_filesystem.h (modified) (1 diff)
• lib/ext4/libext4_superblock.c (modified) (2 diffs)
• lib/ext4/libext4_superblock.h (modified) (2 diffs)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (4 diffs)

uspace/lib/ext4/libext4_balloc.c

@@ -117 +117 @@
         uint32_t block_size = ext4_superblock_get_block_size(fs->superblock);
 
+        // Update superblock free blocks count
+        uint32_t sb_free_blocks = ext4_superblock_get_free_blocks_count(fs->superblock);
+        sb_free_blocks--;
+        ext4_superblock_set_free_blocks_count(fs->superblock, sb_free_blocks);
+
+        // Update inode blocks count
         uint64_t ino_blocks = ext4_inode_get_blocks_count(fs->superblock, inode_ref->inode);
         ino_blocks -= block_size / EXT4_INODE_BLOCK_SIZE;
@@ -122 +128 @@
         inode_ref->dirty = true;
 
+        // Update block group free blocks count
         uint32_t free_blocks = ext4_block_group_get_free_blocks_count(bg_ref->block_group);
         free_blocks++;
         ext4_block_group_set_free_blocks_count(bg_ref->block_group, free_blocks);
         bg_ref->dirty = true;
-
-        // TODO change free blocks count in superblock
 
         rc = ext4_filesystem_put_block_group_ref(bg_ref);
@@ -444 +449 @@
         uint32_t block_size = ext4_superblock_get_block_size(fs->superblock);
 
-        // TODO decrement superblock free blocks count
-        //uint32_t sb_free_blocks = ext4_superblock_get_free_blocks_count(sb);
-        //sb_free_blocks--;
-        //ext4_superblock_set_free_blocks_count(sb, sb_free_blocks);
-
+        // Update superblock free blocks count
+        uint32_t sb_free_blocks = ext4_superblock_get_free_blocks_count(fs->superblock);
+        sb_free_blocks--;
+        ext4_superblock_set_free_blocks_count(fs->superblock, sb_free_blocks);
+
+        // Update inode blocks (different block size!) count
         uint64_t ino_blocks = ext4_inode_get_blocks_count(fs->superblock, inode_ref->inode);
         ino_blocks += block_size / EXT4_INODE_BLOCK_SIZE;
@@ -454 +460 @@
         inode_ref->dirty = true;
 
+        // Update block group free blocks count
         uint32_t bg_free_blocks = ext4_block_group_get_free_blocks_count(bg_ref->block_group);
         bg_free_blocks--;

uspace/lib/ext4/libext4_filesystem.c

@@ -94 +94 @@
 }
 
-void ext4_filesystem_fini(ext4_filesystem_t *fs)
-{
+int ext4_filesystem_fini(ext4_filesystem_t *fs, bool write_sb)
+{
+        int rc = EOK;
+        if (write_sb) {
+                rc = ext4_superblock_write_direct(fs->device, fs->superblock);
+        }
+
         free(fs->superblock);
         block_fini(fs->device);
+
+        return rc;
 }
 
@@ -464 +471 @@
                                 EXT4FS_DBG("allocation error");
                         }
-                        EXT4FS_DBG("BBB: new addr \%u, offset = \%u, level = \%u", new_block_addr, offset_in_block, level);
+//                      EXT4FS_DBG("BBB: new addr \%u, offset = \%u, level = \%u", new_block_addr, offset_in_block, level);
 
                         rc = block_get(&new_block, fs->device, new_block_addr, BLOCK_FLAGS_NOREAD);

uspace/lib/ext4/libext4_filesystem.h

@@ -51 +51 @@
 
 extern int ext4_filesystem_init(ext4_filesystem_t *, service_id_t);
-extern void ext4_filesystem_fini(ext4_filesystem_t *fs);
+extern int ext4_filesystem_fini(ext4_filesystem_t *fs, bool);
 extern int ext4_filesystem_check_sanity(ext4_filesystem_t *fs);
 extern int ext4_filesystem_check_features(ext4_filesystem_t *, bool *);

uspace/lib/ext4/libext4_superblock.c

@@ -65 +65 @@
 }
 
+void ext4_superblock_set_free_blocks_count(ext4_superblock_t *sb, uint64_t count)
+{
+        sb->free_blocks_count_lo = host2uint32_t_le((count << 32) >> 32);
+        sb->free_blocks_count_hi = host2uint32_t_le(count >> 32);
+}
+
 uint32_t ext4_superblock_get_free_inodes_count(ext4_superblock_t *sb)
 {
@@ -268 +274 @@
         return EOK;
 }
+
+int ext4_superblock_write_direct(service_id_t service_id,
+                ext4_superblock_t *sb)
+{
+        int rc;
+        uint32_t phys_block_size;
+        uint64_t first_block;
+        uint32_t block_count;
+
+        rc = block_get_bsize(service_id, &phys_block_size);
+        if (rc != EOK) {
+                // TODO error
+                return rc;
+        }
+
+        first_block = EXT4_SUPERBLOCK_OFFSET / phys_block_size;
+        block_count = EXT4_SUPERBLOCK_SIZE / phys_block_size;
+
+        if (EXT4_SUPERBLOCK_SIZE % phys_block_size) {
+                block_count++;
+        }
+
+        return block_write_direct(service_id, first_block, block_count, sb);
+
+}
+
 
 int ext4_superblock_check_sanity(ext4_superblock_t *sb)

uspace/lib/ext4/libext4_superblock.h

@@ -205 +205 @@
 extern uint64_t ext4_superblock_get_reserved_blocks_count(ext4_superblock_t *);
 extern uint64_t ext4_superblock_get_free_blocks_count(ext4_superblock_t *);
+extern void ext4_superblock_set_free_blocks_count(ext4_superblock_t *, uint64_t);
 extern uint32_t ext4_superblock_get_free_inodes_count(ext4_superblock_t *);
 extern uint32_t ext4_superblock_get_first_data_block(ext4_superblock_t *);
@@ -300 +301 @@
 extern bool ext4_superblock_has_feature_read_only(ext4_superblock_t *, uint32_t);
 extern int ext4_superblock_read_direct(service_id_t, ext4_superblock_t **);
+extern int ext4_superblock_write_direct(service_id_t, ext4_superblock_t *);
 extern int ext4_superblock_check_sanity(ext4_superblock_t *);
 

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -611 +611 @@
         rc = ext4_filesystem_check_sanity(fs);
         if (rc != EOK) {
-                ext4_filesystem_fini(fs);
+                ext4_filesystem_fini(fs, false);
                 free(fs);
                 free(inst);
@@ -620 +620 @@
         rc = ext4_filesystem_check_features(fs, &read_only);
         if (rc != EOK) {
-                ext4_filesystem_fini(fs);
+                ext4_filesystem_fini(fs, false);
                 free(fs);
                 free(inst);
@@ -636 +636 @@
         rc = ext4fs_node_get_core(&root_node, inst, EXT4_INODE_ROOT_INDEX);
         if (rc != EOK) {
-                ext4_filesystem_fini(fs);
+                ext4_filesystem_fini(fs, false);
                 free(fs);
                 free(inst);
@@ -683 +683 @@
         fibril_mutex_unlock(&open_nodes_lock);
 
-        ext4_filesystem_fini(inst->filesystem);
-
-        return EOK;
+        return ext4_filesystem_fini(inst->filesystem, true);
 }