Changeset ebcaff4 in mainline

Timestamp:

2011-12-03T10:42:28Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2449396

Parents:

1e48a07e

Message:

Orphaned inodes handling

Location:

uspace/lib/ext4

Files:

• libext4_filesystem.c (modified) (1 diff)
• libext4_filesystem.h (modified) (1 diff)
• libext4_superblock.c (modified) (1 diff)
• libext4_superblock.h (modified) (1 diff)

uspace/lib/ext4/libext4_filesystem.c

@@ -783 +783 @@
 }
 
+int ext4_filesystem_add_orphan(ext4_filesystem_t *fs,
+                ext4_inode_ref_t *inode_ref)
+{
+        uint32_t next_orphan = ext4_superblock_get_last_orphan(fs->superblock);
+        ext4_inode_set_deletion_time(inode_ref->inode, next_orphan);
+        ext4_superblock_set_last_orphan(fs->superblock, inode_ref->index);
+        inode_ref->dirty = true;
+
+        return EOK;
+}
+
+int ext4_filesystem_delete_orphan(ext4_filesystem_t *fs,
+                ext4_inode_ref_t *inode_ref)
+{
+        int rc;
+
+        uint32_t last_orphan = ext4_superblock_get_last_orphan(fs->superblock);
+        assert(last_orphan > 0);
+
+        uint32_t next_orphan = ext4_inode_get_deletion_time(inode_ref->inode);
+
+        if (last_orphan == inode_ref->index) {
+                ext4_superblock_set_last_orphan(fs->superblock, next_orphan);
+                ext4_inode_set_deletion_time(inode_ref->inode, 0);
+                inode_ref->dirty = true;
+                return EOK;
+        }
+
+        ext4_inode_ref_t *current;
+        rc = ext4_filesystem_get_inode_ref(fs, last_orphan, &current);
+        if (rc != EOK) {
+                return rc;
+        }
+        next_orphan = ext4_inode_get_deletion_time(current->inode);
+
+        bool found;
+
+        while (next_orphan != 0) {
+                if (next_orphan == inode_ref->index) {
+                        next_orphan = ext4_inode_get_deletion_time(inode_ref->inode);
+                        ext4_inode_set_deletion_time(current->inode, next_orphan);
+                        current->dirty = true;
+                        found = true;
+                        break;
+                }
+
+                ext4_filesystem_put_inode_ref(current);
+
+                rc = ext4_filesystem_get_inode_ref(fs, next_orphan, &current);
+                if (rc != EOK) {
+                        return rc;
+                }
+                next_orphan = ext4_inode_get_deletion_time(current->inode);
+
+        }
+
+        ext4_inode_set_deletion_time(inode_ref->inode, 0);
+
+        rc = ext4_filesystem_put_inode_ref(current);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        if (!found) {
+                return ENOENT;
+        }
+
+        return EOK;
+}
+
 /**
  * @}

uspace/lib/ext4/libext4_filesystem.h

@@ -70 +70 @@
 extern int ext4_filesystem_release_inode_block(ext4_filesystem_t *,
                 ext4_inode_ref_t *, uint32_t);
+extern int ext4_filesystem_add_orphan(ext4_filesystem_t *,
+                ext4_inode_ref_t *);
+extern int ext4_filesystem_delete_orphan(ext4_filesystem_t *,
+                ext4_inode_ref_t *);
 #endif
 

uspace/lib/ext4/libext4_superblock.c

@@ -354 +354 @@
 }
 
+uint32_t ext4_superblock_get_last_orphan(ext4_superblock_t *sb)
+{
+        return uint32_t_le2host(sb->last_orphan);
+}
+
+void ext4_superblock_set_last_orphan(ext4_superblock_t *sb, uint32_t last_orphan)
+{
+        sb->last_orphan = host2uint32_t_le(last_orphan);
+}
+
 uint32_t* ext4_superblock_get_hash_seed(ext4_superblock_t *sb)
 {

uspace/lib/ext4/libext4_superblock.h

@@ -272 +272 @@
 uint32_t s_journal_inum; // Inode number of journal file
 uint32_t s_journal_dev; // Device number of journal file
-uint32_t s_last_orphan; // Head of list of inodes to delete
 */
+extern uint32_t ext4_superblock_get_last_orphan(ext4_superblock_t *);
+extern void ext4_superblock_set_last_orphan(ext4_superblock_t *, uint32_t);
 extern uint32_t* ext4_superblock_get_hash_seed(ext4_superblock_t *);
 /*