Changeset 2764497 in mainline

Timestamp:

2013-11-15T21:24:18Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

532f53d

Parents:

7856d09

Message:

libext4: modify ext4_balloc_find_goal() to report the correct error to the caller.

File:

• uspace/lib/ext4/libext4_balloc.c (modified) (6 diffs)

uspace/lib/ext4/libext4_balloc.c

@@ -264 +264 @@
  *
  */
-static uint32_t ext4_balloc_find_goal(ext4_inode_ref_t *inode_ref)
+static int ext4_balloc_find_goal(ext4_inode_ref_t *inode_ref, uint32_t *goal)
 {
-        uint32_t goal = 0;
-        
+        *goal = 0;
         ext4_superblock_t *sb = inode_ref->fs->superblock;
         
@@ -280 +279 @@
         if (inode_block_count > 0) {
                 int rc = ext4_filesystem_get_inode_data_block_index(inode_ref,
-                    inode_block_count - 1, &goal);
+                    inode_block_count - 1, goal);
                 if (rc != EOK)
-                        return 0;
+                        return rc;
                 
                 if (goal != 0) {
-                        goal++;
-                        return goal;
+                        (*goal)++;
+                        return EOK;
                 }
                 
@@ -302 +301 @@
             block_group, &bg_ref);
         if (rc != EOK)
-                return 0;
+                return rc;
         
         /* Compute indexes */
@@ -327 +326 @@
                 inode_table_blocks++;
         
-        goal = inode_table_first_block + inode_table_blocks;
+        *goal = inode_table_first_block + inode_table_blocks;
         
         ext4_filesystem_put_block_group_ref(bg_ref);
         
-        return goal;
+        return EOK;
 }
 
@@ -349 +348 @@
         block_t *bitmap_block;
         uint32_t rel_block_idx = 0;
+        uint32_t goal;
         
         /* Find GOAL */
-        uint32_t goal = ext4_balloc_find_goal(inode_ref);
-        if (goal == 0) {
+        int rc = ext4_balloc_find_goal(inode_ref, &goal);
+        if (rc != EOK)
+                return rc;
+        else if (goal == 0) {
                 /* no goal found => partition is full */
-                return ENOSPC;
+                return ENOMEM;
         }
         
@@ -366 +368 @@
         /* Load block group reference */
         ext4_block_group_ref_t *bg_ref;
-        int rc = ext4_filesystem_get_block_group_ref(inode_ref->fs,
+        rc = ext4_filesystem_get_block_group_ref(inode_ref->fs,
             block_group, &bg_ref);
         if (rc != EOK)