Changes in uspace/lib/libfs/libfs.c [ed903174:1313ee9] in mainline

File:

• uspace/lib/libfs/libfs.c (modified) (15 diffs)

uspace/lib/libfs/libfs.c

@@ -37 +37 @@
 #include "libfs.h"
 #include "../../srv/vfs/vfs.h"
-#include <macros.h>
 #include <errno.h>
 #include <async.h>
@@ -162 +161 @@
         /* Accept the phone */
         callid = async_get_call(&call);
-        int mountee_phone = (int) IPC_GET_ARG1(call);
+        int mountee_phone = (int)IPC_GET_ARG1(call);
         if ((IPC_GET_METHOD(call) != IPC_M_CONNECTION_CLONE) ||
             (mountee_phone < 0)) {
@@ -173 +172 @@
         ipc_answer_0(callid, EOK);
         
+        res = async_data_write_receive(&callid, NULL);
+        if (!res) {
+                ipc_hangup(mountee_phone);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+        
         fs_node_t *fn;
         res = ops->node_get(&fn, mp_dev_handle, mp_fs_index);
         if ((res != EOK) || (!fn)) {
                 ipc_hangup(mountee_phone);
-                async_data_write_void(combine_rc(res, ENOENT));
+                ipc_answer_0(callid, combine_rc(res, ENOENT));
                 ipc_answer_0(rid, combine_rc(res, ENOENT));
                 return;
@@ -185 +192 @@
                 ipc_hangup(mountee_phone);
                 (void) ops->node_put(fn);
-                async_data_write_void(EBUSY);
+                ipc_answer_0(callid, EBUSY);
                 ipc_answer_0(rid, EBUSY);
                 return;
@@ -194 +201 @@
                 ipc_hangup(mountee_phone);
                 (void) ops->node_put(fn);
-                async_data_write_void(rc);
+                ipc_answer_0(callid, rc);
                 ipc_answer_0(rid, rc);
                 return;
@@ -200 +207 @@
         
         ipc_call_t answer;
-        rc = async_data_write_forward_1_1(mountee_phone, VFS_OUT_MOUNTED,
-            mr_dev_handle, &answer);
+        aid_t msg = async_send_1(mountee_phone, VFS_OUT_MOUNTED, mr_dev_handle,
+            &answer);
+        ipc_forward_fast(callid, mountee_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+        async_wait_for(msg, &rc);
         
         if (rc == EOK) {
@@ -215 +224 @@
         ipc_answer_3(rid, rc, IPC_GET_ARG1(answer), IPC_GET_ARG2(answer),
             IPC_GET_ARG3(answer));
-}
-
-void libfs_unmount(libfs_ops_t *ops, ipc_callid_t rid, ipc_call_t *request)
-{
-        dev_handle_t mp_dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
-        fs_index_t mp_fs_index = (fs_index_t) IPC_GET_ARG2(*request);
-        fs_node_t *fn;
-        int res;
-
-        res = ops->node_get(&fn, mp_dev_handle, mp_fs_index);
-        if ((res != EOK) || (!fn)) {
-                ipc_answer_0(rid, combine_rc(res, ENOENT));
-                return;
-        }
-
-        /*
-         * We are clearly expecting to find the mount point active.
-         */
-        if (!fn->mp_data.mp_active) {
-                (void) ops->node_put(fn);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-
-        /*
-         * Tell the mounted file system to unmount.
-         */
-        res = async_req_1_0(fn->mp_data.phone, VFS_OUT_UNMOUNTED,
-            fn->mp_data.dev_handle);
-
-        /*
-         * If everything went well, perform the clean-up on our side.
-         */
-        if (res == EOK) {
-                ipc_hangup(fn->mp_data.phone);
-                fn->mp_data.mp_active = false;
-                fn->mp_data.fs_handle = 0;
-                fn->mp_data.dev_handle = 0;
-                fn->mp_data.phone = 0;
-                /* Drop the reference created in libfs_mount(). */
-                (void) ops->node_put(fn);
-        }
-
-        (void) ops->node_put(fn);
-        ipc_answer_0(rid, res);
 }
 
@@ -340 +304 @@
                 on_error(rc, goto out_with_answer);
                 
-                /*
-                 * If the matching component is a mount point, there are two
-                 * legitimate semantics of the lookup operation. The first is
-                 * the commonly used one in which the lookup crosses each mount
-                 * point into the mounted file system. The second semantics is
-                 * used mostly during unmount() and differs from the first one
-                 * only in that the last mount point in the looked up path,
-                 * which is also its last component, is not crossed.
-                 */
-
-                if ((tmp) && (tmp->mp_data.mp_active) &&
-                    (!(lflag & L_MP) || (next <= last))) {
+                if ((tmp) && (tmp->mp_data.mp_active)) {
                         if (next > last)
                                 next = last = first;
@@ -399 +352 @@
                                                 ipc_answer_0(rid, rc);
                                         } else {
-                                                aoff64_t size = ops->size_get(fn);
-                                                ipc_answer_5(rid, fs_handle,
-                                                    dev_handle,
+                                                ipc_answer_5(rid, EOK,
+                                                    fs_handle, dev_handle,
                                                     ops->index_get(fn),
-                                                    LOWER32(size),
-                                                    UPPER32(size),
+                                                    ops->size_get(fn),
                                                     ops->lnkcnt_get(fn));
                                                 (void) ops->node_put(fn);
@@ -481 +432 @@
                                         ipc_answer_0(rid, rc);
                                 } else {
-                                        aoff64_t size = ops->size_get(fn);
-                                        ipc_answer_5(rid, fs_handle,
-                                            dev_handle,
+                                        ipc_answer_5(rid, EOK,
+                                            fs_handle, dev_handle,
                                             ops->index_get(fn),
-                                            LOWER32(size),
-                                            UPPER32(size),
+                                            ops->size_get(fn),
                                             ops->lnkcnt_get(fn));
                                         (void) ops->node_put(fn);
@@ -506 +455 @@
                 unsigned int old_lnkcnt = ops->lnkcnt_get(cur);
                 rc = ops->unlink(par, cur, component);
-                
-                if (rc == EOK) {
-                        aoff64_t size = ops->size_get(cur);
-                        ipc_answer_5(rid, fs_handle, dev_handle,
-                            ops->index_get(cur), LOWER32(size), UPPER32(size),
-                            old_lnkcnt);
-                } else
-                        ipc_answer_0(rid, rc);
-                
+                ipc_answer_5(rid, (ipcarg_t) rc, fs_handle, dev_handle,
+                    ops->index_get(cur), ops->size_get(cur), old_lnkcnt);
                 goto out;
         }
@@ -533 +475 @@
                 goto out;
         }
-
-        if ((lflag & L_ROOT) && par) {
-                ipc_answer_0(rid, EINVAL);
-                goto out;
-        }
         
 out_with_answer:
@@ -545 +482 @@
                         rc = ops->node_open(cur);
                 
-                if (rc == EOK) {
-                        aoff64_t size = ops->size_get(cur);
-                        ipc_answer_5(rid, fs_handle, dev_handle,
-                            ops->index_get(cur), LOWER32(size), UPPER32(size),
-                            ops->lnkcnt_get(cur));
-                } else
-                        ipc_answer_0(rid, rc);
-                
+                ipc_answer_5(rid, rc, fs_handle, dev_handle,
+                    ops->index_get(cur), ops->size_get(cur),
+                    ops->lnkcnt_get(cur));
         } else
                 ipc_answer_0(rid, rc);
@@ -619 +551 @@
         dev_handle_t dev_handle = IPC_GET_ARG1(*request);
         fs_index_t index = IPC_GET_ARG2(*request);
-        
         fs_node_t *fn;
-        int rc = ops->node_get(&fn, dev_handle, index);
+        int rc;
+        
+        rc = ops->node_get(&fn, dev_handle, index);
         on_error(rc, answer_and_return(rid, rc));
         
@@ -630 +563 @@
         
         rc = ops->node_open(fn);
-        aoff64_t size = ops->size_get(fn);
-        ipc_answer_4(rid, rc, LOWER32(size), UPPER32(size), ops->lnkcnt_get(fn),
+        ipc_answer_3(rid, rc, ops->size_get(fn), ops->lnkcnt_get(fn),
             (ops->is_file(fn) ? L_FILE : 0) | (ops->is_directory(fn) ? L_DIRECTORY : 0));