Changeset e5f8762 in mainline for uspace/srv/fs/ext4fs/ext4fs_ops.c

Timestamp:

2011-11-27T12:16:40Z (13 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

File:

• uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (4 diffs)

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);