Changeset 6843a9c in mainline for uspace/lib/fs/libfs.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/lib/fs/libfs.c (modified) (3 diffs)

uspace/lib/fs/libfs.c

@@ -320 +320 @@
         if (rc != EOK) {
                 async_exchange_end(exch);
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return rc;
         }
@@ -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 == AS_MAP_FAILED) {
                 async_exchange_end(exch);
-                async_wait_for(req, NULL);
+                async_forget(req);
                 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);
         
         if (rc) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return rc;
         }
@@ -409 +404 @@
         
         async_exch_t *exch = async_exchange_begin(mountee_sess);
-        async_sess_t *sess = async_connect_me(EXCHANGE_PARALLEL, exch);
+        async_sess_t *sess = async_clone_establish(EXCHANGE_PARALLEL, exch);
         
         if (!sess) {