Changes in uspace/srv/vfs/vfs_ops.c [b72efe8:27b76ca] in mainline

File:

• uspace/srv/vfs/vfs_ops.c (modified) (7 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -76 +76 @@
         vfs_node_t *mr_node;
         fs_index_t rindex;
-        size_t rsize;
+        aoff64_t rsize;
         unsigned rlnkcnt;
         async_exch_t *exch;
@@ -146 +146 @@
 
                         rindex = (fs_index_t) IPC_GET_ARG1(answer);
-                        rsize = (size_t) IPC_GET_ARG2(answer);
-                        rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
+                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
+                        rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
                         
                         mr_res.triplet.fs_handle = fs_handle;
@@ -229 +229 @@
         if (rc == EOK) {
                 rindex = (fs_index_t) IPC_GET_ARG1(answer);
-                rsize = (size_t) IPC_GET_ARG2(answer);
-                rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
+                rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
+                    IPC_GET_ARG3(answer));
+                rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
                 
                 mr_res.triplet.fs_handle = fs_handle;
@@ -617 +618 @@
 }
 
-void vfs_open_node(ipc_callid_t rid, ipc_call_t *request)
-{
-        // FIXME: check for sanity of the supplied fs, dev and index
-        
-        /*
-         * The interface is open_node(fs, dev, index, oflag).
-         */
-        vfs_lookup_res_t lr;
-        
-        lr.triplet.fs_handle = IPC_GET_ARG1(*request);
-        lr.triplet.devmap_handle = IPC_GET_ARG2(*request);
-        lr.triplet.index = IPC_GET_ARG3(*request);
-        int oflag = IPC_GET_ARG4(*request);
-        
-        fibril_rwlock_read_lock(&namespace_rwlock);
-        
-        int rc = vfs_open_node_internal(&lr);
-        if (rc != EOK) {
-                fibril_rwlock_read_unlock(&namespace_rwlock);
-                async_answer_0(rid, rc);
-                return;
-        }
-        
-        vfs_node_t *node = vfs_node_get(&lr);
-        fibril_rwlock_read_unlock(&namespace_rwlock);
-        
-        /* Truncate the file if requested and if necessary. */
-        if (oflag & O_TRUNC) {
-                fibril_rwlock_write_lock(&node->contents_rwlock);
-                if (node->size) {
-                        rc = vfs_truncate_internal(node->fs_handle,
-                            node->devmap_handle, node->index, 0);
-                        if (rc) {
-                                fibril_rwlock_write_unlock(&node->contents_rwlock);
-                                vfs_node_put(node);
-                                async_answer_0(rid, rc);
-                                return;
-                        }
-                        node->size = 0;
-                }
-                fibril_rwlock_write_unlock(&node->contents_rwlock);
-        }
-        
-        /*
-         * Get ourselves a file descriptor and the corresponding vfs_file_t
-         * structure.
-         */
-        int fd = vfs_fd_alloc((oflag & O_DESC) != 0);
-        if (fd < 0) {
-                vfs_node_put(node);
-                async_answer_0(rid, fd);
-                return;
-        }
-        vfs_file_t *file = vfs_file_get(fd);
-        file->node = node;
-        if (oflag & O_APPEND)
-                file->append = true;
-        
-        /*
-         * 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_IN_CLOSE.
-         */
-        vfs_node_addref(node);
-        vfs_node_put(node);
-        vfs_file_put(file);
-        
-        /* Success! Return the new file descriptor to the client. */
-        async_answer_1(rid, EOK, fd);
-}
-
 void vfs_sync(ipc_callid_t rid, ipc_call_t *request)
 {
@@ -795 +723 @@
         ipc_call_t answer;
         if (read) {
-                rc = async_data_read_forward_3_1(fs_exch, VFS_OUT_READ,
-                    file->node->devmap_handle, file->node->index, file->pos,
-                    &answer);
+                rc = async_data_read_forward_4_1(fs_exch, VFS_OUT_READ,
+                    file->node->devmap_handle, file->node->index,
+                    LOWER32(file->pos), UPPER32(file->pos), &answer);
         } else {
                 if (file->append)
                         file->pos = file->node->size;
                 
-                rc = async_data_write_forward_3_1(fs_exch, VFS_OUT_WRITE,
-                    file->node->devmap_handle, file->node->index, file->pos,
-                    &answer);
+                rc = async_data_write_forward_4_1(fs_exch, VFS_OUT_WRITE,
+                    file->node->devmap_handle, file->node->index,
+                    LOWER32(file->pos), UPPER32(file->pos), &answer);
         }
         
@@ -821 +749 @@
                 /* Update the cached version of node's size. */
                 if (rc == EOK)
-                        file->node->size = IPC_GET_ARG2(answer); 
+                        file->node->size = MERGE_LOUP32(IPC_GET_ARG2(answer),
+                            IPC_GET_ARG3(answer));
                 fibril_rwlock_write_unlock(&file->node->contents_rwlock);
         }
@@ -1347 +1276 @@
 }
 
+void vfs_wait_handle(ipc_callid_t rid, ipc_call_t *request)
+{
+        int fd = vfs_wait_handle_internal();
+        async_answer_1(rid, EOK, fd);
+}
+
 /**
  * @}