Changeset 95947d24 in mainline

Timestamp:

2012-04-08T09:21:51Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

847f2cb

Parents:

6f41312

Message:

balloc: error handling TODOs done

File:

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

uspace/lib/ext4/libext4_balloc.c

@@ -143 +143 @@
         if (rc != EOK) {
                 EXT4FS_DBG("error in saving bg_ref \%d", rc);
-                // TODO error
                 return rc;
         }
@@ -221 +220 @@
         if (rc != EOK) {
                 EXT4FS_DBG("error in saving bg_ref \%d", rc);
-                // TODO error
                 return rc;
         }
@@ -275 +273 @@
 
         if (inode_block_count > 0) {
-                // TODO check retval
-                ext4_filesystem_get_inode_data_block_index(inode_ref, inode_block_count - 1, &goal);
-
-                // TODO
-                // If goal == 0 -> SPARSE file !!!
-
-                goal++;
-                return goal;
+
+                rc = ext4_filesystem_get_inode_data_block_index(inode_ref, inode_block_count - 1, &goal);
+                if (rc != EOK) {
+                        return 0;
+                }
+
+                if (goal != 0) {
+                        goal++;
+                        return goal;
+                }
+
+                // if goal == 0, sparse file -> continue
         }
 
@@ -338 +340 @@
         uint32_t goal = ext4_balloc_find_goal(inode_ref);
         if (goal == 0) {
-                // TODO
+                // no goal found => partition is full
                 EXT4FS_DBG("ERRORR (goal == 0)");
                 return ENOSPC;
@@ -385 +387 @@
                 rc = block_put(bitmap_block);
                 if (rc != EOK) {
-                        // TODO error
-                        EXT4FS_DBG("goal check: error in saving initial bitmap \%d", rc);
+                        EXT4FS_DBG("goal check: error in saving bitmap \%d", rc);
                         ext4_filesystem_put_block_group_ref(bg_ref);
                         return rc;
@@ -411 +412 @@
                         rc = block_put(bitmap_block);
                         if (rc != EOK) {
-                                // TODO error
                                 EXT4FS_DBG("near blocks: error in saving initial bitmap \%d", rc);
+                                return rc;
                         }
 
@@ -429 +430 @@
                 rc = block_put(bitmap_block);
                 if (rc != EOK) {
-                        // TODO error
                         EXT4FS_DBG("free byte: error in saving initial bitmap \%d", rc);
+                        return rc;
                 }
 
@@ -445 +446 @@
                 rc = block_put(bitmap_block);
                 if (rc != EOK) {
-                        // TODO error
                         EXT4FS_DBG("free bit: error in saving initial bitmap \%d", rc);
+                        return rc;
                 }
 
@@ -468 +469 @@
                 rc = ext4_filesystem_get_block_group_ref(inode_ref->fs, bgid, &bg_ref);
                 if (rc != EOK) {
-                        EXT4FS_DBG("errrrrrrrrrrr");
+                        EXT4FS_DBG("ERROR: unable to load block group \%u", bgid);
                         return rc;
                 }
@@ -479 +480 @@
                 if (rc != EOK) {
                         ext4_filesystem_put_block_group_ref(bg_ref);
-                        EXT4FS_DBG("errrrrrrrrrr");
+                        EXT4FS_DBG("ERROR: unable to load bitmap block");
                         return rc;
                 }
@@ -502 +503 @@
                         rc = block_put(bitmap_block);
                         if (rc != EOK) {
-                                // TODO error
-                                EXT4FS_DBG("error in saving bitmap \%d", rc);
+                                EXT4FS_DBG("ERROR: unable to save bitmap block");
+                                return rc;
                         }
 
@@ -518 +519 @@
                         rc = block_put(bitmap_block);
                         if (rc != EOK) {
-                                // TODO error
-                                EXT4FS_DBG("error in saving bitmap \%d", rc);
+                                EXT4FS_DBG("ERROR: unable to save bitmap block");
+                                return rc;
                         }