Changeset fd210de in mainline for uspace/srv

Timestamp:

2009-08-13T17:26:25Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

8344d0a

Parents:

75a2dc08 (diff), 64cbf94 (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:

dd branch synchronized with head

Location:

uspace/srv

Files:

• fs/fat/fat_fat.c (modified) (1 diff)
• fs/fat/fat_fat.h (modified) (1 diff)
• fs/fat/fat_ops.c (modified) (3 diffs)
• ns/task.h (modified) (1 diff)
• vfs/vfs_node.c (modified) (1 diff)

uspace/srv/fs/fat/fat_fat.c

@@ -451 +451 @@
 }
 
+void
+fat_zero_cluster(struct fat_bs *bs, dev_handle_t dev_handle, fat_cluster_t c)
+{
+        int i;
+        block_t *b;
+        unsigned bps;
+
+        bps = uint16_t_le2host(bs->bps);
+        
+        for (i = 0; i < bs->spc; i++) {
+                b = _fat_block_get(bs, dev_handle, c, i, BLOCK_FLAGS_NOREAD);
+                memset(b->data, 0, bps);
+                b->dirty = true;
+                block_put(b);
+        }
+}
+
 /**
  * @}

uspace/srv/fs/fat/fat_fat.h

@@ -84 +84 @@
 extern void fat_fill_gap(struct fat_bs *, struct fat_node *, fat_cluster_t,
     off_t);
+extern void fat_zero_cluster(struct fat_bs *, dev_handle_t, fat_cluster_t);
 
 #endif

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:

uspace/srv/ns/task.h

@@ -35 +35 @@
 
 #include <ipc/ipc.h>
-#include <event.h>
 
 extern int task_init(void);
 extern void process_pending_wait(void);
 
-extern void wait_notification(wait_type_t et, task_id_t id);
 extern void wait_for_task(task_id_t id, ipc_call_t *call, ipc_callid_t callid);
 

uspace/srv/vfs/vfs_node.c

@@ -188 +188 @@
         }
 
-        assert(node->size == result->size);
+        assert(node->size == result->size || node->type != VFS_NODE_FILE);
         assert(node->lnkcnt == result->lnkcnt);
         assert(node->type == result->type || result->type == VFS_NODE_UNKNOWN);