Changeset 63bcbbc in mainline for uspace/srv/fs/exfat/exfat_ops.c

Timestamp:

2011-12-12T20:23:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1df224c

Parents:

bf84871 (diff), 80ec9b8 (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 from lp:exfat-helenos.

File:

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

uspace/srv/fs/exfat/exfat_ops.c

@@ -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 {
@@ -739 +746 @@
          */
         rc = exfat_directory_write_file(&di, name);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                (void) exfat_directory_close(&di);
+                fibril_mutex_unlock(&parentp->idx->lock);
+                return rc;
+        }
         rc = exfat_directory_close(&di);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                fibril_mutex_unlock(&parentp->idx->lock);
+                return rc;
+        }
 
         fibril_mutex_unlock(&parentp->idx->lock);
@@ -1258 +1270 @@
                 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) {
@@ -1268 +1282 @@
                     &df, &ds);
                 if (rc == EOK)
-                    goto hit;
-                if (rc == ENOENT)
-                    goto miss;
+                        goto hit;
+                else if (rc == ENOENT)
+                        goto miss;
+
+                (void) exfat_directory_close(&di);
 
 err:
@@ -1279 +1295 @@
 miss:
                 rc = exfat_directory_close(&di);
-                if (rc!=EOK)
+                if (rc != EOK)
                         goto err;
                 rc = exfat_node_put(fn);
@@ -1397 +1413 @@
 
         (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);