Changes in uspace/srv/vfs/vfs.c [faba839:0fe52ef] in mainline

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);
@@ -159 +156 @@
 int main(int argc, char **argv)
 {
-        printf("%s: HelenOS VFS server\n", NAME);
+        printf(NAME ": HelenOS VFS server\n");
         
         /*
@@ -165 +162 @@
          */
         if (!vfs_nodes_init()) {
-                printf("%s: Failed to initialize VFS node hash table\n",
-                    NAME);
+                printf(NAME ": Failed to initialize VFS node hash table\n");
                 return ENOMEM;
         }
@@ -173 +169 @@
          * Allocate and initialize the Path Lookup Buffer.
          */
-        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);
+        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");
                 return ENOMEM;
         }
@@ -197 +198 @@
         async_set_interrupt_received(notification_received);
         event_task_subscribe(EVENT_TASK_STATE_CHANGE, VFS_TASK_STATE_CHANGE);
-        
+
         /*
          * Register at the naming service.
          */
-        int rc = service_register(SERVICE_VFS);
-        if (rc != EOK) {
+        if (service_register(SERVICE_VFS) != EOK) {
                 printf("%s: Cannot register VFS service\n", NAME);
-                return rc;
+                return EINVAL;
         }
         
@@ -210 +210 @@
          * Start accepting connections.
          */
-        printf("%s: Accepting connections\n", NAME);
+        printf(NAME ": Accepting connections\n");
         async_manager();
         return 0;