Changeset ca47f656 in mainline

Timestamp:

2012-06-03T15:05: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:

840e227

Parents:

4059a28

Message:

excluded functions working with orphans - not needed by driver actually

File:

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

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -544 +544 @@
 
         ext4fs_node_t *enode = EXT4FS_NODE(fn);
-        ext4_filesystem_t *fs = enode->instance->filesystem;
         ext4_inode_ref_t *inode_ref = enode->inode_ref;
 
@@ -555 +554 @@
 
         // Handle orphans
-        uint32_t rev_level = ext4_superblock_get_rev_level(fs->superblock);
-        if (rev_level > 0) {
-                ext4_filesystem_delete_orphan(inode_ref);
-        }
+//      ext4_filesystem_t *fs = enode->instance->filesystem;
+//      uint32_t rev_level = ext4_superblock_get_rev_level(fs->superblock);
+//      uint16_t lnk_count = ext4_inode_get_links_count(inode_ref->inode);
+//      if ((rev_level > 0) && (lnk_count == 0)) {
+//              rc = ext4_filesystem_delete_orphan(inode_ref);
+//              if (rc != EOK) {
+//                      EXT4FS_DBG("delete orphan error, rc = \%d", rc);
+//              }
+//      }
 
         // TODO set real deletion time when it will be supported,
         // temporary set fake time
 //      time_t now = time(NULL);
-        ext4_inode_set_deletion_time(inode_ref->inode, 12345678);
+        ext4_inode_set_deletion_time(inode_ref->inode, 0xdeadbeef);
         inode_ref->dirty = true;
 
@@ -573 +577 @@
         }
 
-        ext4fs_node_put(fn);
-        return EOK;
+        return ext4fs_node_put(fn);
 }
 
@@ -674 +677 @@
         // Remove entry from parent directory
         ext4_inode_ref_t *parent = EXT4FS_NODE(pfn)->inode_ref;
-        ext4_filesystem_t *fs = EXT4FS_NODE(pfn)->instance->filesystem;
         rc = ext4_directory_remove_entry(parent, name);
         if (rc != EOK) {
@@ -703 +705 @@
         }
 
-        uint32_t rev_level = ext4_superblock_get_rev_level(fs->superblock);
-        if ((rev_level > 0) && (lnk_count == 0)) {
-                ext4_filesystem_add_orphan(child_inode_ref);
-        }
+//      ext4_filesystem_t *fs = EXT4FS_NODE(pfn)->instance->filesystem;
+//      uint32_t rev_level = ext4_superblock_get_rev_level(fs->superblock);
+//      if ((rev_level > 0) && (lnk_count == 0)) {
+//              rc = ext4_filesystem_add_orphan(child_inode_ref);
+//              if (rc != EOK) {
+//                      EXT4FS_DBG("add orphan error, rc = \%d", rc);
+//              }
+//      }
 
         // TODO set timestamps for parent (when we have wall-clock time)