Changes in uspace/lib/fs/libfs.c [fbcdeb8:2d884ab] in mainline

File:

• uspace/lib/fs/libfs.c (modified) (6 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;
         }
@@ -339 +339 @@
          */
         rc = async_share_in_start_0_0(exch, PLB_SIZE, (void *) &reg.plb_ro);
-        if (reg.plb_ro == (void *) -1) {
+        if (reg.plb_ro == AS_MAP_FAILED) {
                 async_exchange_end(exch);
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return ENOMEM;
         }
@@ -348 +348 @@
         
         if (rc) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return rc;
         }
@@ -404 +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) {
@@ -631 +631 @@
                                                 async_answer_0(rid, rc);
                                         } else {
-                                                aoff64_t size = ops->size_get(fn);
-                                                async_answer_5(rid, fs_handle,
-                                                    service_id,
-                                                    ops->index_get(fn),
-                                                    LOWER32(size),
-                                                    UPPER32(size),
-                                                    ops->lnkcnt_get(fn));
-                                                (void) ops->node_put(fn);
+                                                (void) ops->node_put(cur);
+                                                cur = fn;
+                                                goto out_with_answer;
                                         }
                                 } else
@@ -715 +710 @@
                                         async_answer_0(rid, rc);
                                 } else {
-                                        aoff64_t size = ops->size_get(fn);
-                                        async_answer_5(rid, fs_handle,
-                                            service_id,
-                                            ops->index_get(fn),
-                                            LOWER32(size),
-                                            UPPER32(size),
-                                            ops->lnkcnt_get(fn));
-                                        (void) ops->node_put(fn);
+                                        (void) ops->node_put(cur);
+                                        cur = fn;
+                                        goto out_with_answer;
                                 }
                         } else