WebSVN – HelenOS – Diff – /branches/network/uspace/srv/vfs/vfs_ops.c

             return;
+        }
         /*
          * Now we hold a reference to mp_node.
-         * It will be dropped upon the corresponding VFS_UNMOUNT.
+         * It will be dropped upon the corresponding VFS_IN_UNMOUNT.
          * This prevents the mount point from being deleted.
          */
     } else {
         /* We still don't have the root file system mounted. */
         if (str_cmp(mp, "/") == 0) {
              * we are almost done.
              */
             /* Tell the mountee that it is being mounted. */
             phone = vfs_grab_phone(fs_handle);
-            msg = async_send_1(phone, VFS_MOUNTED,
+            msg = async_send_1(phone, VFS_OUT_MOUNTED,
                 (ipcarg_t) dev_handle, &answer);
             /* send the mount options */
             rc = ipc_data_write_start(phone, (void *)opts,
                 str_size(opts));
             if (rc != EOK) {
     int mountee_phone = vfs_grab_phone(fs_handle);
     assert(mountee_phone >= 0);
     phone = vfs_grab_phone(mp_res.triplet.fs_handle);
-    msg = async_send_4(phone, VFS_MOUNT,
+    msg = async_send_4(phone, VFS_OUT_MOUNT,
         (ipcarg_t) mp_res.triplet.dev_handle,
         (ipcarg_t) mp_res.triplet.index,
         (ipcarg_t) fs_handle,
         (ipcarg_t) dev_handle, &answer);
         free(mp);
         return;
+    }
     /* Check the offered options size. */
-    if (size < 0 || size > MAX_MNTOPTS_LEN) {
+    if (size > MAX_MNTOPTS_LEN) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         free(mp);
         return;
+    }
         return;
+    }
     /*
      * The POSIX interface is open(path, oflag, mode).
-     * We can receive oflags and mode along with the VFS_OPEN call; the path
+     * We can receive oflags and mode along with the VFS_IN_OPEN call;
-     * will need to arrive in another call.
+     * the path will need to arrive in another call.
+     *
      * We also receive one private, non-POSIX set of flags called lflag
      * used to pass information to vfs_lookup_internal().
      */
     int lflag = IPC_GET_ARG1(*request);
     int oflag = IPC_GET_ARG2(*request);
     int mode = IPC_GET_ARG3(*request);
     size_t len;
+    /* Ignore mode for now. */
+    (void) mode;
     /*
      * Make sure that we are called with exactly one of L_FILE and
      * L_DIRECTORY. Make sure that the user does not pass L_OPEN.
      */
     /*
      * The following increase in reference count is for the fact that the
      * file is being opened and that a file structure is pointing to it.
      * It is necessary so that the file will not disappear when
      * vfs_node_put() is called. The reference will be dropped by the
-     * respective VFS_CLOSE.
+     * respective VFS_IN_CLOSE.
      */
     vfs_node_addref(node);
     vfs_node_put(node);
     /* Success! Return the new file descriptor to the client. */
     /*
      * The following increase in reference count is for the fact that the
      * file is being opened and that a file structure is pointing to it.
      * It is necessary so that the file will not disappear when
      * vfs_node_put() is called. The reference will be dropped by the
-     * respective VFS_CLOSE.
+     * respective VFS_IN_CLOSE.
      */
     vfs_node_addref(node);
     vfs_node_put(node);
     /* Success! Return the new file descriptor to the client. */
     ipc_answer_1(rid, EOK, fd);
+}
-void vfs_node(ipc_callid_t rid, ipc_call_t *request)
-{
-    int fd = IPC_GET_ARG1(*request);
-    /* Lookup the file structure corresponding to the file descriptor. */
-    vfs_file_t *file = vfs_file_get(fd);
-    if (!file) {
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    ipc_answer_3(rid, EOK, file->node->fs_handle, file->node->dev_handle,
-        file->node->index);
-}
-void vfs_device(ipc_callid_t rid, ipc_call_t *request)
-{
-    int fd = IPC_GET_ARG1(*request);
-    /* Lookup the file structure corresponding to the file descriptor. */
-    vfs_file_t *file = vfs_file_get(fd);
-    if (!file) {
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    /*
-     * Lock the open file structure so that no other thread can manipulate
-     * the same open file at a time.
-     */
-    fibril_mutex_lock(&file->lock);
-    int fs_phone = vfs_grab_phone(file->node->fs_handle);
-    /* Make a VFS_DEVICE request at the destination FS server. */
-    aid_t msg;
-    ipc_call_t answer;
-    msg = async_send_2(fs_phone, IPC_GET_METHOD(*request),
-        file->node->dev_handle, file->node->index, &answer);
-    /* Wait for reply from the FS server. */
-    ipcarg_t rc;
-    async_wait_for(msg, &rc);
-    vfs_release_phone(fs_phone);
-    fibril_mutex_unlock(&file->lock);
-    ipc_answer_1(rid, EOK, IPC_GET_ARG1(answer));
-}
 void vfs_sync(ipc_callid_t rid, ipc_call_t *request)
+{
     int fd = IPC_GET_ARG1(*request);
     /* Lookup the file structure corresponding to the file descriptor. */
      * the same open file at a time.
      */
     fibril_mutex_lock(&file->lock);
     int fs_phone = vfs_grab_phone(file->node->fs_handle);
-    /* Make a VFS_SYMC request at the destination FS server. */
+    /* Make a VFS_OUT_SYMC request at the destination FS server. */
     aid_t msg;
     ipc_call_t answer;
-    msg = async_send_2(fs_phone, IPC_GET_METHOD(*request),
+    msg = async_send_2(fs_phone, VFS_OUT_SYNC, file->node->dev_handle,
-        file->node->dev_handle, file->node->index, &answer);
+        file->node->index, &answer);
     /* Wait for reply from the FS server. */
     ipcarg_t rc;
     async_wait_for(msg, &rc);
      * the same open file at a time.
      */
     fibril_mutex_lock(&file->lock);
     int fs_phone = vfs_grab_phone(file->node->fs_handle);
-    /* Make a VFS_CLOSE request at the destination FS server. */
+    /* Make a VFS_OUT_CLOSE request at the destination FS server. */
     aid_t msg;
     ipc_call_t answer;
-    msg = async_send_2(fs_phone, IPC_GET_METHOD(*request),
+    msg = async_send_2(fs_phone, VFS_OUT_CLOSE, file->node->dev_handle,
-        file->node->dev_handle, file->node->index, &answer);
+        file->node->index, &answer);
     /* Wait for reply from the FS server. */
     ipcarg_t rc;
     async_wait_for(msg, &rc);
     /* Make a VFS_READ/VFS_WRITE request at the destination FS server. */
     aid_t msg;
     ipc_call_t answer;
     if (!read && file->append)
         file->pos = file->node->size;
-    msg = async_send_3(fs_phone, IPC_GET_METHOD(*request),
+    msg = async_send_3(fs_phone, read ? VFS_OUT_READ : VFS_OUT_WRITE,
         file->node->dev_handle, file->node->index, file->pos, &answer);
     /*
      * Forward the IPC_M_DATA_READ/IPC_M_DATA_WRITE request to the
      * destination FS server. The call will be routed as if sent by
+{
     ipcarg_t rc;
     int fs_phone;
     fs_phone = vfs_grab_phone(fs_handle);
-    rc = async_req_3_0(fs_phone, VFS_TRUNCATE, (ipcarg_t)dev_handle,
+    rc = async_req_3_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t)dev_handle,
         (ipcarg_t)index, (ipcarg_t)size);
     vfs_release_phone(fs_phone);
     return (int)rc;
+}
     fibril_mutex_unlock(&file->lock);
     ipc_answer_0(rid, (ipcarg_t)rc);
+}
+void vfs_fstat(ipc_callid_t rid, ipc_call_t *request)
+{
+    int fd = IPC_GET_ARG1(*request);
+    size_t size = IPC_GET_ARG2(*request);
+    ipcarg_t rc;
+    vfs_file_t *file = vfs_file_get(fd);
+    if (!file) {
+        ipc_answer_0(rid, ENOENT);
+        return;
+    }
+    ipc_callid_t callid;
+    if (!ipc_data_read_receive(&callid, NULL)) {
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        return;
+    }
+    fibril_mutex_lock(&file->lock);
+    int fs_phone = vfs_grab_phone(file->node->fs_handle);
+    aid_t msg;
+    msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->dev_handle,
+        file->node->index, true, NULL);
+    ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+    async_wait_for(msg, &rc);
+    vfs_release_phone(fs_phone);
+    fibril_mutex_unlock(&file->lock);
+    ipc_answer_0(rid, rc);
+}
+void vfs_stat(ipc_callid_t rid, ipc_call_t *request)
+{
+    size_t len;
+    ipc_callid_t callid;
+    if (!ipc_data_write_receive(&callid, &len)) {
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        return;
+    }
+    char *path = malloc(len + 1);
+    if (!path) {
+        ipc_answer_0(callid, ENOMEM);
+        ipc_answer_0(rid, ENOMEM);
+        return;
+    }
+    int rc;
+    if ((rc = ipc_data_write_finalize(callid, path, len))) {
+        ipc_answer_0(rid, rc);
+        free(path);
+        return;
+    }
+    path[len] = '\0';
+    if (!ipc_data_read_receive(&callid, NULL)) {
+        free(path);
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        return;
+    }
+    vfs_lookup_res_t lr;
+    fibril_rwlock_read_lock(&namespace_rwlock);
+    rc = vfs_lookup_internal(path, L_NONE, &lr, NULL);
+    free(path);
+    if (rc != EOK) {
+        fibril_rwlock_read_unlock(&namespace_rwlock);
+        ipc_answer_0(callid, rc);
+        ipc_answer_0(rid, rc);
+        return;
+    }
+    vfs_node_t *node = vfs_node_get(&lr);
+    if (!node) {
+        fibril_rwlock_read_unlock(&namespace_rwlock);
+        ipc_answer_0(callid, ENOMEM);
+        ipc_answer_0(rid, ENOMEM);
+        return;
+    }
+    fibril_rwlock_read_unlock(&namespace_rwlock);
+    int fs_phone = vfs_grab_phone(node->fs_handle);
+    aid_t msg;
+    msg = async_send_3(fs_phone, VFS_OUT_STAT, node->dev_handle,
+        node->index, false, NULL);
+    ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+    ipcarg_t rv;
+    async_wait_for(msg, &rv);
+    vfs_release_phone(fs_phone);
+    ipc_answer_0(rid, rv);
+    vfs_node_put(node);
+}
 void vfs_mkdir(ipc_callid_t rid, ipc_call_t *request)
+{
     int mode = IPC_GET_ARG1(*request);
     size_t len;
         ipc_answer_0(rid, rc);
         free(path);
         return;
+    }
     path[len] = '\0';
+    /* Ignore mode for now. */
+    (void) mode;
     fibril_rwlock_write_lock(&namespace_rwlock);
     int lflag = L_DIRECTORY | L_CREATE | L_EXCLUSIVE;
     rc = vfs_lookup_internal(path, lflag, NULL, NULL);
     fibril_rwlock_write_unlock(&namespace_rwlock);
+    }
     /*
      * The name has already been unlinked by vfs_lookup_internal().
      * We have to get and put the VFS node to ensure that it is
-     * VFS_DESTROY'ed after the last reference to it is dropped.
+     * VFS_OUT_DESTROY'ed after the last reference to it is dropped.
      */
     vfs_node_t *node = vfs_node_get(&lr);
     fibril_mutex_lock(&nodes_mutex);
     node->lnkcnt--;
     fibril_mutex_unlock(&nodes_mutex);

Subversion Repositories HelenOS

(root)/branches/network/uspace/srv/vfs/vfs_ops.c @ 4748 – Rev 4581 → 4718