Changeset 7943c43 in mainline for uspace/lib/fs/libfs.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/lib/fs/libfs.c (modified) (1 diff)

uspace/lib/fs/libfs.c

@@ -336 +336 @@
         
         /*
-         * Allocate piece of address space for PLB.
-         */
-        reg.plb_ro = as_get_mappable_page(PLB_SIZE);
-        if (!reg.plb_ro) {
+         * Request sharing the Path Lookup Buffer with VFS.
+         */
+        rc = async_share_in_start_0_0(exch, PLB_SIZE, (void *) &reg.plb_ro);
+        if (reg.plb_ro == (void *) -1) {
                 async_exchange_end(exch);
                 async_wait_for(req, NULL);
                 return ENOMEM;
         }
-        
-        /*
-         * Request sharing the Path Lookup Buffer with VFS.
-         */
-        rc = async_share_in_start_0_0(exch, reg.plb_ro, PLB_SIZE);
         
         async_exchange_end(exch);