Changeset 8b36bf2 in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2012-06-20T23:03:29Z (11 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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) (1 diff)

uspace/srv/vfs/vfs.c

@@ -173 +173 @@
          * Allocate and initialize the Path Lookup Buffer.
          */
-        plb = as_area_create((void *) -1, PLB_SIZE,
+        plb = as_area_create(AS_AREA_ANY, PLB_SIZE,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
-        if (plb == (void *) -1) {
+        if (plb == AS_MAP_FAILED) {
                 printf("%s: Cannot create address space area\n", NAME);
                 return ENOMEM;