Changeset 37b1651d in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2011-03-02T11:53:22Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af430ce, e135751

Parents:

4c7c251 (diff), 3f7efa79 (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/fat/fat_ops.c (modified) (4 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -325 +325 @@
                     uint16_t_le2host(d->firstc));
                 if (rc != EOK) {
+                        (void) block_put(b);
                         (void) fat_node_put(FS_NODE(nodep));
                         return rc;
@@ -811 +812 @@
         fibril_mutex_unlock(&childp->idx->lock);
         childp->lnkcnt = 0;
+        childp->refcnt++;       /* keep the node in memory until destroyed */
         childp->dirty = true;
         fibril_mutex_unlock(&childp->lock);
@@ -1488 +1490 @@
         fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
         fs_node_t *fn;
+        fat_node_t *nodep;
         int rc;
 
@@ -1499 +1502 @@
                 return;
         }
+
+        nodep = FAT_NODE(fn);
+        /*
+         * We should have exactly two references. One for the above
+         * call to fat_node_get() and one from fat_unlink().
+         */
+        assert(nodep->refcnt == 2);
 
         rc = fat_destroy_node(fn);