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

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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) (3 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -332 +332 @@
         /* idxp->lock held */
         if (flags & L_DIRECTORY) {
-                int i;
-                block_t *b;
-
-                /*
-                 * Populate the new cluster with unused dentries.
-                 */
-                for (i = 0; i < bs->spc; i++) {
-                        b = _fat_block_get(bs, dev_handle, mcl, i,
-                            BLOCK_FLAGS_NOREAD);
-                        /* mark all dentries as never-used */
-                        memset(b->data, 0, bps);
-                        b->dirty = false;
-                        block_put(b);
-                }
+                /* Populate the new cluster with unused dentries. */
+                fat_zero_cluster(bs, dev_handle, mcl);
                 nodep->type = FAT_DIRECTORY;
                 nodep->firstc = mcl;
@@ -462 +450 @@
          * We need to grow the parent in order to create a new unused dentry.
          */
-        if (parentp->idx->pfc == FAT_CLST_ROOT) {
+        if (parentp->firstc == FAT_CLST_ROOT) {
                 /* Can't grow the root directory. */
                 fibril_mutex_unlock(&parentp->idx->lock);
@@ -472 +460 @@
                 return rc;
         }
+        fat_zero_cluster(bs, parentp->idx->dev_handle, mcl);
         fat_append_clusters(bs, parentp, mcl);
-        b = fat_block_get(bs, parentp, i, BLOCK_FLAGS_NOREAD);
+        parentp->size += bps * bs->spc;
+        parentp->dirty = true;          /* need to sync node */
+        b = fat_block_get(bs, parentp, i, BLOCK_FLAGS_NONE);
         d = (fat_dentry_t *)b->data;
-        /*
-         * Clear all dentries in the block except for the first one (the first
-         * dentry will be cleared in the next step).
-         */
-        memset(d + 1, 0, bps - sizeof(fat_dentry_t));
 
 hit: