Changeset c699b0c in mainline for uspace/srv/fs/minixfs/mfs_balloc.c

Timestamp:

2011-09-04T13:12:33Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a5ee6c

Parents:

03bc76a

Message:

remove the on_error() macro

File:

• uspace/srv/fs/minixfs/mfs_balloc.c (modified) (4 diffs)

uspace/srv/fs/minixfs/mfs_balloc.c

@@ -151 +151 @@
 
         r = block_get(&b, inst->service_id, block, BLOCK_FLAGS_NONE);
-        on_error(r, goto out_err);
+        if (r != EOK)
+                goto out_err;
 
         /*Compute the bit index in the block*/
@@ -219 +220 @@
                               BLOCK_FLAGS_NONE);
 
-                on_error(r, goto out);
+                if (r != EOK)
+                        goto out;
 
                 unsigned tmp = *search % bits_per_block;
@@ -228 +230 @@
                         /*No free bit in this block*/
                         r = block_put(b);
-                        on_error(r, goto out);
+                        if (r != EOK)
+                                goto out;
                         continue;
                 }
@@ -237 +240 @@
                         /*Index is beyond the limit, it is invalid*/
                         r = block_put(b);
-                        on_error(r, goto out);
+                        if (r != EOK)
+                                goto out;
                         break;
                 }