Changes in uspace/srv/fs/mfs/mfs_rw.c [95027b5:9d58539] in mainline

File:

• uspace/srv/fs/mfs/mfs_rw.c (modified) (13 diffs)

uspace/srv/fs/mfs/mfs_rw.c

@@ -104 +104 @@
     bool write_mode, uint32_t w_block)
 {
-        int nr_direct;
+        int r, nr_direct;
         int ptrs_per_block;
-        uint32_t *ind_zone = NULL, *ind2_zone = NULL;
-        int r = EOK;
+        uint32_t *ind_zone, *ind2_zone;
 
         struct mfs_ino_info *ino_i = mnode->ino_i;
@@ -131 +130 @@
                         ino_i->dirty = true;
                 }
-                goto out;
+                return EOK;
         }
 
@@ -143 +142 @@
                                 r = alloc_zone_and_clear(inst, &zone);
                                 if (r != EOK)
-                                        goto out;
+                                        return r;
 
                                 ino_i->i_izone[0] = zone;
@@ -150 +149 @@
                                 /* Sparse block */
                                 *b = 0;
-                                goto out;
+                                return EOK;
                         }
                 }
@@ -156 +155 @@
                 r = read_ind_zone(inst, ino_i->i_izone[0], &ind_zone);
                 if (r != EOK)
-                        goto out;
+                        return r;
 
                 *b = ind_zone[rblock];
@@ -164 +163 @@
                 }
 
-                goto out;
+                goto out_free_ind1;
         }
 
@@ -177 +176 @@
                         r = alloc_zone_and_clear(inst, &zone);
                         if (r != EOK)
-                                goto out;
+                                return r;
 
                         ino_i->i_izone[1] = zone;
@@ -184 +183 @@
                         /* Sparse block */
                         *b = 0;
-                        goto out;
+                        return EOK;
                 }
         }
@@ -190 +189 @@
         r = read_ind_zone(inst, ino_i->i_izone[1], &ind_zone);
         if (r != EOK)
-                goto out;
+                return r;
 
         /*
@@ -204 +203 @@
                         r = alloc_zone_and_clear(inst, &zone);
                         if (r != EOK)
-                                goto out;
+                                goto out_free_ind1;
 
                         ind_zone[ind2_off] = zone;
@@ -210 +209 @@
                 } else {
                         /* Sparse block */
+                        r = EOK;
                         *b = 0;
-                        goto out;
+                        goto out_free_ind1;
                 }
         }
@@ -217 +217 @@
         r = read_ind_zone(inst, ind_zone[ind2_off], &ind2_zone);
         if (r != EOK)
-                goto out;
+                goto out_free_ind1;
 
         *b = ind2_zone[rblock - (ind2_off * ptrs_per_block)];
@@ -225 +225 @@
         }
 
-out:
+        r = EOK;
+
         free(ind2_zone);
+out_free_ind1:
         free(ind_zone);
         return r;