Changeset 00aece0 in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/vfs/vfs.c (modified) (2 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);
@@ -169 +172 @@
          * 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) {
+        plb = as_area_create((void *) -1, PLB_SIZE,
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
+        if (plb == (void *) -1) {
                 printf(NAME ": Cannot create address space area\n");
                 return ENOMEM;