Changeset 6843a9c in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/vfs/vfs.c (modified) (6 diffs)

uspace/srv/vfs/vfs.c

@@ -127 +127 @@
                         vfs_wait_handle(callid, &call);
                         break;
+                case VFS_IN_MTAB_GET:
+                        vfs_get_mtab(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOTSUP);
@@ -156 +159 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS VFS server\n");
+        printf("%s: HelenOS VFS server\n", NAME);
         
         /*
@@ -162 +165 @@
          */
         if (!vfs_nodes_init()) {
-                printf(NAME ": Failed to initialize VFS node hash table\n");
+                printf("%s: Failed to initialize VFS node hash table\n",
+                    NAME);
                 return ENOMEM;
         }
@@ -169 +173 @@
          * Allocate and initialize the Path Lookup Buffer.
          */
-        plb = as_get_mappable_page(PLB_SIZE);
-        if (!plb) {
-                printf(NAME ": Cannot allocate a mappable piece of address space\n");
-                return ENOMEM;
-        }
-        
-        if (as_area_create(plb, PLB_SIZE, AS_AREA_READ | AS_AREA_WRITE |
-            AS_AREA_CACHEABLE) != plb) {
-                printf(NAME ": Cannot create address space area\n");
+        plb = as_area_create(AS_AREA_ANY, PLB_SIZE,
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
+        if (plb == AS_MAP_FAILED) {
+                printf("%s: Cannot create address space area\n", NAME);
                 return ENOMEM;
         }
@@ -198 +197 @@
         async_set_interrupt_received(notification_received);
         event_task_subscribe(EVENT_TASK_STATE_CHANGE, VFS_TASK_STATE_CHANGE);
-
+        
         /*
          * Register at the naming service.
          */
-        if (service_register(SERVICE_VFS) != EOK) {
+        int rc = service_register(SERVICE_VFS);
+        if (rc != EOK) {
                 printf("%s: Cannot register VFS service\n", NAME);
-                return EINVAL;
+                return rc;
         }
         
@@ -210 +210 @@
          * Start accepting connections.
          */
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
         async_manager();
         return 0;