Changeset 98cb0495 in mainline for uspace/srv/fs/exfat/exfat_ops.c

Timestamp:

2012-03-04T18:52:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

38b950f

Parents:

6561a8e (diff), 0499235 (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/exfat/exfat_ops.c (modified) (6 diffs)

uspace/srv/fs/exfat/exfat_ops.c

@@ -405 +405 @@
 
         if (!nodep->fragmented) {
-                rc = bitmap_append_clusters(bs, nodep, clusters);
+                rc = exfat_bitmap_append_clusters(bs, nodep, clusters);
                 if (rc != ENOSPC)
                         return rc;
@@ -411 +411 @@
                         nodep->fragmented = true;
                         nodep->dirty = true;            /* need to sync node */
-                        rc = bitmap_replicate_clusters(bs, nodep);
+                        rc = exfat_bitmap_replicate_clusters(bs, nodep);
                         if (rc != EOK)
                                 return rc;
@@ -457 +457 @@
 
                 clsts = prev_clsts - new_clsts;
-                rc = bitmap_free_clusters(bs, nodep, clsts);
+                rc = exfat_bitmap_free_clusters(bs, nodep, clsts);
                 if (rc != EOK)
                         return rc;
@@ -704 +704 @@
                                 nodep->firstc);
                 else
-                        rc = bitmap_free_clusters(bs, nodep, 
+                        rc = exfat_bitmap_free_clusters(bs, nodep, 
                             ROUND_UP(nodep->size, BPC(bs)) / BPC(bs));
         } 
@@ -758 +758 @@
 
         fibril_mutex_unlock(&parentp->idx->lock);
-        if (rc != EOK)
-                return rc;
-
         fibril_mutex_lock(&childp->idx->lock);
-
 
         childp->idx->pfc = parentp->firstc;
@@ -1463 +1459 @@
         }
 
-        (void) exfat_node_put(fn);
+        int rc2 = exfat_node_put(fn);
+        if (rc == EOK && rc2 != EOK)
+                rc = rc2;
+
         return rc;
 }