Changes in uspace/srv/fs/exfat/exfat_ops.c [7cede12c:b33870b] in mainline

File:

• uspace/srv/fs/exfat/exfat_ops.c (modified) (11 diffs)

uspace/srv/fs/exfat/exfat_ops.c

@@ -405 +405 @@
 
         if (!nodep->fragmented) {
-                rc = exfat_bitmap_append_clusters(bs, nodep, clusters);
+                rc = bitmap_append_clusters(bs, nodep, clusters);
                 if (rc != ENOSPC)
                         return rc;
@@ -411 +411 @@
                         nodep->fragmented = true;
                         nodep->dirty = true;            /* need to sync node */
-                        rc = exfat_bitmap_replicate_clusters(bs, nodep);
+                        rc = bitmap_replicate_clusters(bs, nodep);
                         if (rc != EOK)
                                 return rc;
@@ -457 +457 @@
 
                 clsts = prev_clsts - new_clsts;
-                rc = exfat_bitmap_free_clusters(bs, nodep, clsts);
+                rc = bitmap_free_clusters(bs, nodep, clsts);
                 if (rc != EOK)
                         return rc;
@@ -657 +657 @@
                         return rc;
                 }
-
-                rc = exfat_zero_cluster(bs, service_id, nodep->firstc);
-                if (rc != EOK) {
-                        (void) exfat_node_put(FS_NODE(nodep));
-                        return rc;
-                }
-
                 nodep->size = BPC(bs);
         } else {
@@ -704 +697 @@
                                 nodep->firstc);
                 else
-                        rc = exfat_bitmap_free_clusters(bs, nodep, 
+                        rc = bitmap_free_clusters(bs, nodep, 
                             ROUND_UP(nodep->size, BPC(bs)) / BPC(bs));
         } 
@@ -746 +739 @@
          */
         rc = exfat_directory_write_file(&di, name);
-        if (rc != EOK) {
-                (void) exfat_directory_close(&di);
-                fibril_mutex_unlock(&parentp->idx->lock);
-                return rc;
-        }
+        if (rc != EOK)
+                return rc;
         rc = exfat_directory_close(&di);
-        if (rc != EOK) {
-                fibril_mutex_unlock(&parentp->idx->lock);
-                return rc;
-        }
+        if (rc != EOK)
+                return rc;
 
         fibril_mutex_unlock(&parentp->idx->lock);
+        if (rc != EOK)
+                return rc;
+
         fibril_mutex_lock(&childp->idx->lock);
+
 
         childp->idx->pfc = parentp->firstc;
@@ -1266 +1258 @@
                 exfat_directory_t di;
                 rc = exfat_directory_open(nodep, &di);
-                if (rc != EOK)
-                        goto err;
-
+                if (rc != EOK) goto err;
                 rc = exfat_directory_seek(&di, pos);
                 if (rc != EOK) {
@@ -1278 +1268 @@
                     &df, &ds);
                 if (rc == EOK)
-                        goto hit;
-                else if (rc == ENOENT)
-                        goto miss;
-
-                (void) exfat_directory_close(&di);
+                    goto hit;
+                if (rc == ENOENT)
+                    goto miss;
 
 err:
@@ -1291 +1279 @@
 miss:
                 rc = exfat_directory_close(&di);
-                if (rc != EOK)
+                if (rc!=EOK)
                         goto err;
                 rc = exfat_node_put(fn);
@@ -1409 +1397 @@
 
         (void) async_data_write_finalize(callid,
-            b->data + pos % BPS(bs), bytes);
+                b->data + pos % BPS(bs), bytes);
         b->dirty = true;                /* need to sync block */
         rc = block_put(b);
@@ -1459 +1447 @@
         }
 
-        int rc2 = exfat_node_put(fn);
-        if (rc == EOK && rc2 != EOK)
-                rc = rc2;
-
+        (void) exfat_node_put(fn);
         return rc;
 }