Changeset 81092ce in mainline

Timestamp:

2012-04-04T18:03:04Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

662bd71

Parents:

d3ee35b

Message:

fixed bug with block group flags

Location:

uspace/lib/ext4

Files:

• libext4_block_group.c (modified) (1 diff)
• libext4_block_group.h (modified) (1 diff)
• libext4_ialloc.c (modified) (2 diffs)
• libext4_types.h (modified) (1 diff)

uspace/lib/ext4/libext4_block_group.c

@@ -200 +200 @@
 }
 
+// Flags operations
+bool ext4_block_group_has_flag(ext4_block_group_t *bg, uint32_t flag)
+{
+        if (ext4_block_group_get_flags(bg) & flag) {
+                return true;
+        }
+        return false;
+}
+
 /**
  * @}

uspace/lib/ext4/libext4_block_group.h

@@ -73 +73 @@
 extern void ext4_block_group_set_checksum(ext4_block_group_t *, uint16_t);
 
+extern bool ext4_block_group_has_flag(ext4_block_group_t *, uint32_t);
 #endif
 

uspace/lib/ext4/libext4_ialloc.c

@@ -112 +112 @@
                         sb, free_inodes);
 
-        uint32_t unused_inodes = ext4_block_group_get_itable_unused(
-                        bg_ref->block_group, sb);
-        unused_inodes++;
-        ext4_block_group_set_itable_unused(bg_ref->block_group, sb, unused_inodes);
-
+        if (ext4_block_group_has_flag(bg_ref->block_group, EXT4_BLOCK_GROUP_INODE_UNINIT)) {
+                uint32_t unused_inodes = ext4_block_group_get_itable_unused(
+                                bg_ref->block_group, sb);
+                unused_inodes++;
+                ext4_block_group_set_itable_unused(bg_ref->block_group, sb, unused_inodes);
+        }
 
         bg_ref->dirty = true;
@@ -193 +194 @@
                         ext4_block_group_set_free_inodes_count(bg, sb, free_inodes);
 
-                        uint16_t unused_inodes = ext4_block_group_get_itable_unused(bg, sb);
-                        unused_inodes--;
-                        ext4_block_group_set_itable_unused(bg, sb, unused_inodes);
+                        if (ext4_block_group_has_flag(bg, EXT4_BLOCK_GROUP_INODE_UNINIT)) {
+                                uint16_t unused_inodes = ext4_block_group_get_itable_unused(bg, sb);
+                                unused_inodes--;
+                                ext4_block_group_set_itable_unused(bg, sb, unused_inodes);
+                        }
 
                         if (is_dir) {

uspace/lib/ext4/libext4_types.h

@@ -205 +205 @@
 /*****************************************************************************/
 
+#define EXT4_BLOCK_GROUP_INODE_UNINIT   0x0001 /* Inode table/bitmap not in use */
+#define EXT4_BLOCK_GROUP_BLOCK_UNINIT   0x0002 /* Block bitmap not in use */
+#define EXT4_BLOCK_GROUP_INODE_ZEROED   0x0004 /* On-disk itable initialized to zero */
 
 /*