Changeset e5f8762 in mainline

Timestamp:

2011-11-27T12:16:40Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

d4d2954

Parents:

5f6cb14

Message:

Fixed bugs in directory removal process

Location:

uspace

Files:

• lib/ext4/libext4_directory.c (modified) (1 diff)
• lib/ext4/libext4_filesystem.c (modified) (2 diffs)
• lib/ext4/libext4_ialloc.c (modified) (2 diffs)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (4 diffs)

uspace/lib/ext4/libext4_directory.c

@@ -317 +317 @@
         }
 
-        if (rc != EOK) {
-                ext4_directory_iterator_fini(&it);
-                return rc;
-        }
-
         // TODO modify HTREE index if exists
 

uspace/lib/ext4/libext4_filesystem.c

@@ -387 +387 @@
         }
 
+        inode_ref->dirty = true;
+
         // Free inode
         rc = ext4_ialloc_free_inode(fs, inode_ref);
@@ -441 +443 @@
         for (i = 1; i <= blocks_count; ++i) {
                 // TODO check retval
-                // TODO decrement inode->blocks_count
-
                 ext4_filesystem_release_inode_block(fs, inode_ref, total_blocks - i);
         }

uspace/lib/ext4/libext4_ialloc.c

@@ -37 +37 @@
 
 #include <errno.h>
+#include <time.h>
 #include "libext4.h"
 
@@ -90 +91 @@
         }
 
+        time_t now = time(NULL);
+        ext4_inode_set_deletion_time(inode_ref->inode, (uint32_t)now);
+        inode_ref->dirty = true;
+
+        // if inode is directory, decrement directories count
+        if (ext4_inode_is_type(fs->superblock, inode_ref->inode, EXT4_INODE_MODE_DIRECTORY)) {
+                uint32_t bg_used_dirs = ext4_block_group_get_used_dirs_count(
+                        bg_ref->block_group, fs->superblock);
+                bg_used_dirs--;
+                ext4_block_group_set_used_dirs_count(
+                                bg_ref->block_group, fs->superblock, bg_used_dirs);
+        }
+
         // Update superblock free inodes count
         uint32_t sb_free_inodes = ext4_superblock_get_free_inodes_count(fs->superblock);
-        sb_free_inodes--;
+        sb_free_inodes++;
         ext4_superblock_set_free_inodes_count(fs->superblock, sb_free_inodes);
 

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -469 +469 @@
         // If directory - handle links from parent
         if (lnk_count <= 1 && ext4fs_is_directory(cfn)) {
-
-                if (lnk_count) {
-                        lnk_count--;
-                }
-
                 ext4_inode_ref_t *parent_inode_ref = EXT4FS_NODE(pfn)->inode_ref;
 
@@ -567 +562 @@
 unsigned ext4fs_lnkcnt_get(fs_node_t *fn)
 {
+        if (ext4fs_is_directory(fn)) {
+                if (lnkcnt > 1) {
+                        EXT4FS_DBG("dir: returning \%u", 1);
+                        return 1;
+                } else {
+                        EXT4FS_DBG("dir: returning \%u", 0);
+                        return 0;
+                }
+        }
+
+        // For regular files return real links count
         ext4fs_node_t *enode = EXT4FS_NODE(fn);
         return ext4_inode_get_links_count(enode->inode_ref->inode);
@@ -685 +691 @@
                 return rc;
         }
-        ext4fs_node_t *enode = EXT4FS_NODE(root_node);
 
         /* Add instance to the list */
@@ -694 +699 @@
         *index = EXT4_INODE_ROOT_INDEX;
         *size = 0;
-        *lnkcnt = ext4_inode_get_links_count(enode->inode_ref->inode);
+        *lnkcnt = 1;
 
         ext4fs_node_put(root_node);