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

Timestamp:

2012-03-31T20:00:15Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

a2fa350

Parents:

38384ae

Message:

simplied headers of more functions, improved bg_ref and inode_ref structures, added block group checksumming and fixed bug in block_group values updating

File:

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

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -211 +211 @@
 
         ext4_directory_search_result_t result;
-        rc = ext4_directory_find_entry(fs, &result, eparent->inode_ref, component);
+        rc = ext4_directory_find_entry(&result, eparent->inode_ref, component);
         if (rc != EOK) {
                 if (rc == ENOENT) {
@@ -448 +448 @@
         ext4_inode_ref_t *inode_ref = enode->inode_ref;
 
-        rc = ext4_filesystem_truncate_inode(fs, inode_ref, 0);
+        rc = ext4_filesystem_truncate_inode(inode_ref, 0);
         if (rc != EOK) {
                 ext4fs_node_put(fn);
@@ -456 +456 @@
         uint32_t rev_level = ext4_superblock_get_rev_level(fs->superblock);
         if (rev_level > 0) {
-                ext4_filesystem_delete_orphan(fs, inode_ref);
+                ext4_filesystem_delete_orphan(inode_ref);
         }
 
@@ -465 +465 @@
         inode_ref->dirty = true;
 
-        rc = ext4_filesystem_free_inode(fs, inode_ref);
+        rc = ext4_filesystem_free_inode(inode_ref);
         if (rc != EOK) {
                 ext4fs_node_put(fn);
@@ -489 +489 @@
 
         // Add entry to parent directory
-        rc = ext4_directory_add_entry(fs, parent->inode_ref, name, child->inode_ref);
+        rc = ext4_directory_add_entry(parent->inode_ref, name, child->inode_ref);
         if (rc != EOK) {
                 return rc;
@@ -497 +497 @@
         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);
+                rc = ext4_directory_add_entry(child->inode_ref, ".", child->inode_ref);
                 if (rc != EOK) {
-                        ext4_directory_remove_entry(fs, parent->inode_ref, name);
+                        ext4_directory_remove_entry(parent->inode_ref, name);
                         return rc;
                 }
 
-                rc = ext4_directory_add_entry(fs, child->inode_ref, "..", parent->inode_ref);
+                rc = ext4_directory_add_entry(child->inode_ref, "..", parent->inode_ref);
                 if (rc != EOK) {
-                        ext4_directory_remove_entry(fs, parent->inode_ref, name);
-                        ext4_directory_remove_entry(fs, child->inode_ref, ".");
+                        ext4_directory_remove_entry(parent->inode_ref, name);
+                        ext4_directory_remove_entry(child->inode_ref, ".");
                         return rc;
                 }
@@ -546 +546 @@
         ext4_inode_ref_t *parent = EXT4FS_NODE(pfn)->inode_ref;
         ext4_filesystem_t *fs = EXT4FS_NODE(pfn)->instance->filesystem;
-        rc = ext4_directory_remove_entry(fs, parent, name);
+        rc = ext4_directory_remove_entry(parent, name);
         if (rc != EOK) {
                 return rc;
@@ -576 +576 @@
         uint32_t rev_level = ext4_superblock_get_rev_level(fs->superblock);
         if ((rev_level > 0) && (lnk_count == 0)) {
-                ext4_filesystem_add_orphan(fs, child_inode_ref);
+                ext4_filesystem_add_orphan(child_inode_ref);
         }
 
@@ -1002 +1002 @@
         /* Get the real block number */
         uint32_t fs_block;
-        rc = ext4_filesystem_get_inode_data_block_index(inst->filesystem,
-                inode_ref, file_block, &fs_block);
+        rc = ext4_filesystem_get_inode_data_block_index(inode_ref, file_block, &fs_block);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -1090 +1089 @@
 
         ext4_inode_ref_t *inode_ref = enode->inode_ref;
-        rc = ext4_filesystem_get_inode_data_block_index(fs, inode_ref, iblock, &fblock);
+        rc = ext4_filesystem_get_inode_data_block_index(inode_ref, iblock, &fblock);
         if (rc != EOK) {
                 ext4fs_node_put(fn);
@@ -1098 +1097 @@
 
         if (fblock == 0) {
-                rc =  ext4_balloc_alloc_block(fs, inode_ref, &fblock);
+                rc =  ext4_balloc_alloc_block(inode_ref, &fblock);
                 if (rc != EOK) {
                         ext4fs_node_put(fn);
@@ -1105 +1104 @@
                 }
 
-                rc = ext4_filesystem_set_inode_data_block_index(fs, inode_ref, iblock, fblock);
+                rc = ext4_filesystem_set_inode_data_block_index(inode_ref, iblock, fblock);
                 if (rc != EOK) {
-                        ext4_balloc_free_block(fs, inode_ref, fblock);
+                        ext4_balloc_free_block(inode_ref, fblock);
                         ext4fs_node_put(fn);
                         async_answer_0(callid, rc);
@@ -1169 +1168 @@
         ext4fs_node_t *enode = EXT4FS_NODE(fn);
         ext4_inode_ref_t *inode_ref = enode->inode_ref;
-        ext4_filesystem_t *fs = enode->instance->filesystem;
-
-        rc = ext4_filesystem_truncate_inode(fs, inode_ref, new_size);
+
+        rc = ext4_filesystem_truncate_inode(inode_ref, new_size);
         ext4fs_node_put(fn);