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

Timestamp:

2011-09-04T13:12:33Z (13 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_rw.c (modified) (12 diffs)

uspace/srv/fs/minixfs/mfs_rw.c

@@ -135 +135 @@
                                 uint32_t zone;
                                 r = alloc_zone_and_clear(inst, &zone);
-                                on_error(r, return r);
+                                if (r != EOK)
+                                        return r;
 
                                 ino_i->i_izone[0] = zone;
@@ -147 +148 @@
 
                 r = read_ind_zone(inst, ino_i->i_izone[0], &ind_zone);
-                on_error(r, return r);
+                if (r != EOK)
+                        return r;
 
                 *b = ind_zone[rblock];
@@ -167 +169 @@
                         uint32_t zone;
                         r = alloc_zone_and_clear(inst, &zone);
-                        on_error(r, return r);
+                        if (r != EOK)
+                                return r;
 
                         ino_i->i_izone[1] = zone;
@@ -179 +182 @@
 
         r = read_ind_zone(inst, ino_i->i_izone[1], &ind_zone);
-        on_error(r, return r);
+        if (r != EOK)
+                return r;
 
         /*
@@ -192 +196 @@
                         uint32_t zone;
                         r = alloc_zone_and_clear(inst, &zone);
-                        on_error(r, goto out_free_ind1);
+                        if (r != EOK)
+                                goto out_free_ind1;
 
                         ind_zone[ind2_off] = zone;
@@ -205 +210 @@
 
         r = read_ind_zone(inst, ind_zone[ind2_off], &ind2_zone);
-        on_error(r, goto out_free_ind1);
+        if (r != EOK)
+                goto out_free_ind1;
 
         *b = ind2_zone[ind2_off % ptrs_per_block];
@@ -247 +253 @@
                 if (ino_i->i_izone[0]) {
                         r = mfs_free_zone(inst, ino_i->i_izone[0]);
-                        on_error(r, return r);
+                        if (r != EOK)
+                                return r;
 
                         ino_i->i_izone[0] = 0;
@@ -270 +277 @@
 
         r = read_ind_zone(inst, ino_i->i_izone[1], &dbl_zone);
-        on_error(r, return r);
+        if (r != EOK)
+                return r;
 
         for (i = fzone_to_free; i < ptrs_per_block; ++i) {
@@ -277 +285 @@
 
                 r = mfs_free_zone(inst, dbl_zone[i]);
-                on_error(r, goto out);
+                if (r != EOK)
+                        goto out;
         }
 
@@ -297 +306 @@
 
         r = block_get(&b, inst->service_id, zone, BLOCK_FLAGS_NOREAD);
-        on_error(r, return r);
+        if (r != EOK)
+                return r;
 
         memset(b->data, 0, b->size);
@@ -311 +321 @@
 
         r = mfs_alloc_zone(inst, zone);
-        on_error(r, return r);
+        if (r != EOK)
+                return r;
 
         r = reset_zone_content(inst, *zone);
@@ -361 +372 @@
 
         r = block_get(&b, inst->service_id, zone, BLOCK_FLAGS_NONE);
-        on_error(r, return r);
+        if (r != EOK)
+                return r;
 
         if (sbi->fs_version == MFS_VERSION_V1) {