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

Timestamp:

2012-01-24T16:32:32Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

02aad10

Parents:

786bd56

Message:

bugfixes of inode allocation and link operation

File:

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

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -401 +401 @@
         }
 
+        EXT4FS_DBG("allocated");
+
         enode->inode_ref = inode_ref;
         enode->instance = inst;
@@ -424 +426 @@
         *rfn = fs_node;
 
+        EXT4FS_DBG("finished");
+
         // TODO
         return EOK;
@@ -431 +435 @@
 int ext4fs_destroy_node(fs_node_t *fn)
 {
+        EXT4FS_DBG("");
         int rc;
 
@@ -480 +485 @@
 int ext4fs_link(fs_node_t *pfn, fs_node_t *cfn, const char *name)
 {
+        EXT4FS_DBG("");
+
         int rc;
 
@@ -487 +494 @@
         }
 
+        EXT4FS_DBG("name checked");
+
         ext4fs_node_t *parent = EXT4FS_NODE(pfn);
         ext4fs_node_t *child = EXT4FS_NODE(cfn);
@@ -492 +501 @@
 
         // Add entry to parent directory
-        rc = ext4_directory_add_entry(fs, parent->inode_ref, name, child->inode_ref->index);
-        if (rc != EOK) {
-                return rc;
-        }
+        rc = ext4_directory_add_entry(fs, parent->inode_ref, name, child->inode_ref);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        EXT4FS_DBG("dentry added");
 
         // Fill new dir -> add '.' and '..' entries
         if (ext4_inode_is_type(fs->superblock, child->inode_ref->inode, EXT4_INODE_MODE_DIRECTORY)) {
 
-                rc = ext4_directory_add_entry(fs, child->inode_ref, ".", child->inode_ref->index);
+                rc = ext4_directory_add_entry(fs, child->inode_ref, ".", child->inode_ref);
                 if (rc != EOK) {
                         ext4_directory_remove_entry(fs, parent->inode_ref, name);
@@ -506 +517 @@
                 }
 
-                rc = ext4_directory_add_entry(fs, child->inode_ref, "..", parent->inode_ref->index);
+                EXT4FS_DBG("added dot");
+
+                rc = ext4_directory_add_entry(fs, child->inode_ref, "..", parent->inode_ref);
                 if (rc != EOK) {
                         ext4_directory_remove_entry(fs, parent->inode_ref, name);
@@ -512 +525 @@
                         return rc;
                 }
+
+                EXT4FS_DBG("added dotdot");
 
                 uint16_t parent_links = ext4_inode_get_links_count(parent->inode_ref->inode);