Changeset 0773396 in mainline for uspace/srv/fs/mfs/mfs_rw.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

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