Changeset 985e26d2 in mainline for uspace/srv/fs/tmpfs/tmpfs.c

Timestamp:

2010-01-07T19:06:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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/tmpfs/tmpfs.c (modified) (4 diffs)

uspace/srv/fs/tmpfs/tmpfs.c

@@ -48 +48 @@
 #include <unistd.h>
 #include <stdio.h>
+#include <task.h>
 #include <libfs.h>
 #include "../../vfs/vfs.h"
@@ -55 +56 @@
 
 vfs_info_t tmpfs_vfs_info = {
-        .name = "tmpfs",
+        .name = NAME,
 };
 
@@ -90 +91 @@
         }
         
-        dprintf("VFS-TMPFS connection established.\n");
+        dprintf(NAME ": connection opened\n");
         while (1) {
                 ipc_callid_t callid;
@@ -162 +163 @@
 
         printf(NAME ": Accepting connections\n");
+        task_retval(0);
         async_manager();
         /* not reached */