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

Timestamp:

2012-01-28T10:51:56Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

7c506ced

Parents:

fe56c08a

Message:

some TODO's solved + removed debugging messages

File:

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

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -373 +373 @@
 int ext4fs_create_node(fs_node_t **rfn, service_id_t service_id, int flags)
 {
-        EXT4FS_DBG("");
         int rc;
 
@@ -405 +404 @@
         }
 
-        EXT4FS_DBG("allocated");
-
         enode->inode_ref = inode_ref;
         enode->instance = inst;
@@ -430 +427 @@
         *rfn = fs_node;
 
-        EXT4FS_DBG("finished");
-
-        // TODO
         return EOK;
 }
@@ -439 +433 @@
 int ext4fs_destroy_node(fs_node_t *fn)
 {
-        EXT4FS_DBG("");
         int rc;
 
@@ -450 +443 @@
 
         if (has_children) {
-                EXT4FS_DBG("destroying non-empty node");
                 ext4fs_node_put(fn);
                 return EINVAL;
@@ -489 +481 @@
 int ext4fs_link(fs_node_t *pfn, fs_node_t *cfn, const char *name)
 {
-        EXT4FS_DBG("");
-
         int rc;
 
@@ -497 +487 @@
                 return ENAMETOOLONG;
         }
-
-        EXT4FS_DBG("name checked");
-
         ext4fs_node_t *parent = EXT4FS_NODE(pfn);
         ext4fs_node_t *child = EXT4FS_NODE(cfn);
@@ -509 +496 @@
                 return rc;
         }
-
-        EXT4FS_DBG("dentry added");
 
         // Fill new dir -> add '.' and '..' entries
@@ -520 +505 @@
                         return rc;
                 }
-
-                EXT4FS_DBG("added dot");
 
                 rc = ext4_directory_add_entry(fs, child->inode_ref, "..", parent->inode_ref);
@@ -530 +513 @@
                 }
 
-                EXT4FS_DBG("added dotdot");
-
                 uint16_t parent_links = ext4_inode_get_links_count(parent->inode_ref->inode);
                 parent_links++;
@@ -552 +533 @@
 int ext4fs_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *name)
 {
-//      EXT4FS_DBG("unlinking \%s", name);
-
         int rc;
 
@@ -559 +538 @@
         rc = ext4fs_has_children(&has_children, cfn);
         if (rc != EOK) {
-                EXT4FS_DBG("\%s error: \%u", name, rc);
                 return rc;
         }
@@ -573 +551 @@
         rc = ext4_directory_remove_entry(fs, parent, name);
         if (rc != EOK) {
-                EXT4FS_DBG("\%s removing entry failed: \%u", name, rc);
                 return rc;
         }
@@ -1086 +1063 @@
         rc = ext4fs_node_get(&fn, service_id, index);
         if (rc != EOK) {
-                EXT4FS_DBG("node get error");
                 return rc;
         }
@@ -1096 +1072 @@
                 ext4fs_node_put(fn);
                 async_answer_0(callid, rc);
-                EXT4FS_DBG("data write recv");
                 return rc;
         }
@@ -1136 +1111 @@
                 rc = ext4_filesystem_set_inode_data_block_index(fs, inode_ref, iblock, fblock);
                 if (rc != EOK) {
-                        EXT4FS_DBG("ERROR: setting index failed");
+                        ext4_balloc_free_block(fs, inode_ref, fblock);
+                        ext4fs_node_put(fn);
+                        async_answer_0(callid, rc);
+                        return rc;
                 }
                 inode_ref->dirty = true;