Changes in uspace/lib/fs/libfs.c [9934f7d:b946bf83] in mainline

File:

• uspace/lib/fs/libfs.c (modified) (13 diffs)

uspace/lib/fs/libfs.c

@@ -67 +67 @@
  * code.
  *
- * @param sess Session for communication with VFS.
- * @param reg  File system registration structure. It will be
- *             initialized by this function.
- * @param info VFS info structure supplied by the file system
- *             implementation.
- * @param conn Connection fibril for handling all calls originating in
- *             VFS.
+ * @param vfs_phone Open phone for communication with VFS.
+ * @param reg       File system registration structure. It will be
+ *                  initialized by this function.
+ * @param info      VFS info structure supplied by the file system
+ *                  implementation.
+ * @param conn      Connection fibril for handling all calls originating in
+ *                  VFS.
  *
  * @return EOK on success or a non-zero error code on errror.
  *
  */
-int fs_register(async_sess_t *sess, fs_reg_t *reg, vfs_info_t *info,
+int fs_register(int vfs_phone, fs_reg_t *reg, vfs_info_t *info,
     async_client_conn_t conn)
 {
@@ -86 +86 @@
          * out-of-order, when it knows that the operation succeeded or failed.
          */
-        
-        async_exch_t *exch = async_exchange_begin(sess);
-        
         ipc_call_t answer;
-        aid_t req = async_send_0(exch, VFS_IN_REGISTER, &answer);
+        aid_t req = async_send_0(vfs_phone, VFS_IN_REGISTER, &answer);
         
         /*
          * Send our VFS info structure to VFS.
          */
-        int rc = async_data_write_start(exch, info, sizeof(*info));
-        
+        int rc = async_data_write_start(vfs_phone, info, sizeof(*info)); 
         if (rc != EOK) {
-                async_exchange_end(exch);
                 async_wait_for(req, NULL);
                 return rc;
@@ -106 +101 @@
          * Ask VFS for callback connection.
          */
-        async_connect_to_me(exch, 0, 0, 0, conn, NULL);
+        async_connect_to_me(vfs_phone, 0, 0, 0, conn);
         
         /*
@@ -113 +108 @@
         reg->plb_ro = as_get_mappable_page(PLB_SIZE);
         if (!reg->plb_ro) {
-                async_exchange_end(exch);
                 async_wait_for(req, NULL);
                 return ENOMEM;
@@ -121 +115 @@
          * 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);
-        
+        rc = async_share_in_start_0_0(vfs_phone, reg->plb_ro, PLB_SIZE);
         if (rc) {
                 async_wait_for(req, NULL);
@@ -157 +148 @@
         fs_handle_t mr_fs_handle = (fs_handle_t) IPC_GET_ARG3(*request);
         devmap_handle_t mr_devmap_handle = (devmap_handle_t) IPC_GET_ARG4(*request);
-        
-        async_sess_t *mountee_sess = async_clone_receive(EXCHANGE_PARALLEL);
-        if (mountee_sess == NULL) {
+        int res;
+        sysarg_t rc;
+        
+        ipc_call_t call;
+        ipc_callid_t callid;
+        
+        /* Accept the phone */
+        callid = async_get_call(&call);
+        int mountee_phone = (int) IPC_GET_ARG1(call);
+        if ((IPC_GET_IMETHOD(call) != IPC_M_CONNECTION_CLONE) ||
+            (mountee_phone < 0)) {
+                async_answer_0(callid, EINVAL);
                 async_answer_0(rid, EINVAL);
                 return;
         }
         
+        /* Acknowledge the mountee_phone */
+        async_answer_0(callid, EOK);
+        
         fs_node_t *fn;
-        int res = ops->node_get(&fn, mp_devmap_handle, mp_fs_index);
+        res = ops->node_get(&fn, mp_devmap_handle, mp_fs_index);
         if ((res != EOK) || (!fn)) {
-                async_hangup(mountee_sess);
+                async_hangup(mountee_phone);
                 async_data_write_void(combine_rc(res, ENOENT));
                 async_answer_0(rid, combine_rc(res, ENOENT));
@@ -174 +177 @@
         
         if (fn->mp_data.mp_active) {
-                async_hangup(mountee_sess);
+                async_hangup(mountee_phone);
                 (void) ops->node_put(fn);
                 async_data_write_void(EBUSY);
@@ -181 +184 @@
         }
         
-        async_exch_t *exch = async_exchange_begin(mountee_sess);
-        async_sess_t *sess = async_connect_me(EXCHANGE_PARALLEL, exch);
-        
-        if (!sess) {
-                async_exchange_end(exch);
-                async_hangup(mountee_sess);
+        rc = async_req_0_0(mountee_phone, IPC_M_CONNECT_ME);
+        if (rc != EOK) {
+                async_hangup(mountee_phone);
                 (void) ops->node_put(fn);
-                async_data_write_void(errno);
-                async_answer_0(rid, errno);
+                async_data_write_void(rc);
+                async_answer_0(rid, rc);
                 return;
         }
         
         ipc_call_t answer;
-        int rc = async_data_write_forward_1_1(exch, VFS_OUT_MOUNTED,
+        rc = async_data_write_forward_1_1(mountee_phone, VFS_OUT_MOUNTED,
             mr_devmap_handle, &answer);
-        async_exchange_end(exch);
         
         if (rc == EOK) {
@@ -202 +201 @@
                 fn->mp_data.fs_handle = mr_fs_handle;
                 fn->mp_data.devmap_handle = mr_devmap_handle;
-                fn->mp_data.sess = mountee_sess;
+                fn->mp_data.phone = mountee_phone;
         }
         
@@ -237 +236 @@
          * Tell the mounted file system to unmount.
          */
-        async_exch_t *exch = async_exchange_begin(fn->mp_data.sess);
-        res = async_req_1_0(exch, VFS_OUT_UNMOUNTED, fn->mp_data.devmap_handle);
-        async_exchange_end(exch);
+        res = async_req_1_0(fn->mp_data.phone, VFS_OUT_UNMOUNTED,
+            fn->mp_data.devmap_handle);
 
         /*
@@ -245 +243 @@
          */
         if (res == EOK) {
-                async_hangup(fn->mp_data.sess);
+                async_hangup(fn->mp_data.phone);
                 fn->mp_data.mp_active = false;
                 fn->mp_data.fs_handle = 0;
                 fn->mp_data.devmap_handle = 0;
-                fn->mp_data.sess = NULL;
-                
+                fn->mp_data.phone = 0;
                 /* Drop the reference created in libfs_mount(). */
                 (void) ops->node_put(fn);
@@ -296 +293 @@
         
         if (cur->mp_data.mp_active) {
-                async_exch_t *exch = async_exchange_begin(cur->mp_data.sess);
-                async_forward_slow(rid, exch, VFS_OUT_LOOKUP, next, last,
-                    cur->mp_data.devmap_handle, lflag, index, IPC_FF_ROUTE_FROM_ME);
-                async_exchange_end(exch);
-                
+                async_forward_slow(rid, cur->mp_data.phone, VFS_OUT_LOOKUP,
+                    next, last, cur->mp_data.devmap_handle, lflag, index,
+                    IPC_FF_ROUTE_FROM_ME);
                 (void) ops->node_put(cur);
                 return;
@@ -356 +351 @@
                                 next--;
                         
-                        async_exch_t *exch = async_exchange_begin(tmp->mp_data.sess);
-                        async_forward_slow(rid, exch, VFS_OUT_LOOKUP, next, last,
-                            tmp->mp_data.devmap_handle, lflag, index,
-                            IPC_FF_ROUTE_FROM_ME);
-                        async_exchange_end(exch);
-                        
+                        async_forward_slow(rid, tmp->mp_data.phone,
+                            VFS_OUT_LOOKUP, next, last, tmp->mp_data.devmap_handle,
+                            lflag, index, IPC_FF_ROUTE_FROM_ME);
                         (void) ops->node_put(cur);
                         (void) ops->node_put(tmp);