Changes in uspace/srv/fs/fat/fat_ops.c [d44aabd:a405563] in mainline

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) {
-                /* Populate the new cluster with unused dentries. */
-                fat_zero_cluster(bs, dev_handle, mcl);
+                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);
+                }
                 nodep->type = FAT_DIRECTORY;
                 nodep->firstc = mcl;
@@ -450 +462 @@
          * We need to grow the parent in order to create a new unused dentry.
          */
-        if (parentp->firstc == FAT_CLST_ROOT) {
+        if (parentp->idx->pfc == FAT_CLST_ROOT) {
                 /* Can't grow the root directory. */
                 fibril_mutex_unlock(&parentp->idx->lock);
@@ -460 +472 @@
                 return rc;
         }
-        fat_zero_cluster(bs, parentp->idx->dev_handle, mcl);
         fat_append_clusters(bs, parentp, mcl);
-        parentp->size += bps * bs->spc;
-        parentp->dirty = true;          /* need to sync node */
-        b = fat_block_get(bs, parentp, i, BLOCK_FLAGS_NONE);
+        b = fat_block_get(bs, parentp, i, BLOCK_FLAGS_NOREAD);
         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: