Changeset fec333b3 in mainline

Timestamp:

2017-05-15T19:24:25Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0e7c3d9

Parents:

9c96634

Message:

Revert cluster allocation only if clusters were allocated

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (2 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -499 +499 @@
                 /* populate the new cluster with unused dentries */
                 rc = fat_zero_cluster(bs, service_id, mcl);
-                if (rc != EOK) {
-                        (void) fat_free_clusters(bs, service_id, mcl);
-                        return rc;
-                }
+                if (rc != EOK)
+                        goto error;
         }
 
         rc = fat_node_get_new(&nodep);
-        if (rc != EOK) {
-                (void) fat_free_clusters(bs, service_id, mcl);
-                return rc;
-        }
+        if (rc != EOK)
+                goto error;
         rc = fat_idx_get_new(&idxp, service_id);
         if (rc != EOK) {
-                (void) fat_free_clusters(bs, service_id, mcl);  
                 (void) fat_node_put(FS_NODE(nodep));
-                return rc;
+                goto error;
         }
         /* idxp->lock held */
@@ -536 +531 @@
         *rfn = FS_NODE(nodep);
         return EOK;
+
+error:
+        if (flags & L_DIRECTORY)
+                (void) fat_free_clusters(bs, service_id, mcl);
+        return rc;              
 }