Changes in uspace/srv/vfs/vfs_ops.c [19f857a:b4cbef1] in mainline

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -38 +38 @@
 #include "vfs.h"
 #include <ipc/ipc.h>
-#include <macros.h>
-#include <limits.h>
 #include <async.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <str.h>
+#include <string.h>
 #include <bool.h>
 #include <fibril_synch.h>
@@ -55 +53 @@
 
 /* Forward declarations of static functions. */
-static int vfs_truncate_internal(fs_handle_t, dev_handle_t, fs_index_t, aoff64_t);
+static int vfs_truncate_internal(fs_handle_t, dev_handle_t, fs_index_t, size_t);
 
 /**
@@ -269 +267 @@
         /* We want the client to send us the mount point. */
         char *mp;
-        int rc = async_data_write_accept((void **) &mp, true, 0, MAX_PATH_LEN,
-            0, NULL);
+        int rc = async_string_receive(&mp, MAX_PATH_LEN, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -278 +275 @@
         /* Now we expect to receive the mount options. */
         char *opts;
-        rc = async_data_write_accept((void **) &opts, true, 0, MAX_MNTOPTS_LEN,
-            0, NULL);
+        rc = async_string_receive(&opts, MAX_MNTOPTS_LEN, NULL);
         if (rc != EOK) {
                 free(mp);
@@ -291 +287 @@
          */
         char *fs_name;
-        rc = async_data_write_accept((void **) &fs_name, true, 0, FS_NAME_MAXLEN,
-            0, NULL);
+        rc = async_string_receive(&fs_name, FS_NAME_MAXLEN, NULL);
         if (rc != EOK) {
                 free(mp);
@@ -355 +350 @@
         vfs_lookup_res_t mp_res;
         vfs_lookup_res_t mr_res;
+        vfs_node_t *mp_node;
         vfs_node_t *mr_node;
         int phone;
@@ -361 +357 @@
          * Receive the mount point path.
          */
-        rc = async_data_write_accept((void **) &mp, true, 0, MAX_PATH_LEN,
-            0, NULL);
+        rc = async_string_receive(&mp, MAX_PATH_LEN, NULL);
         if (rc != EOK)
                 ipc_answer_0(rid, rc);
@@ -504 +499 @@
         int oflag = IPC_GET_ARG2(*request);
         int mode = IPC_GET_ARG3(*request);
+        size_t len;
 
         /* Ignore mode for now. */
@@ -526 +522 @@
         
         char *path;
-        int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL);
+        int rc = async_string_receive(&path, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -840 +836 @@
                     &answer);
         } else {
-                rc = async_data_write_forward_3_1(fs_phone, VFS_OUT_WRITE,
+                rc = async_data_forward_3_1(fs_phone, VFS_OUT_WRITE,
                     file->node->dev_handle, file->node->index, file->pos,
                     &answer);
@@ -887 +883 @@
 {
         int fd = (int) IPC_GET_ARG1(*request);
-        off64_t off =
-            (off64_t) MERGE_LOUP32(IPC_GET_ARG2(*request), IPC_GET_ARG3(*request));
-        int whence = (int) IPC_GET_ARG4(*request);
-        
+        off_t off = (off_t) IPC_GET_ARG2(*request);
+        int whence = (int) IPC_GET_ARG3(*request);
+
+
         /* Lookup the file structure corresponding to the file descriptor. */
         vfs_file_t *file = vfs_file_get(fd);
@@ -897 +893 @@
                 return;
         }
-        
+
+        off_t newpos;
         fibril_mutex_lock(&file->lock);
-        
-        off64_t newoff;
-        switch (whence) {
-                case SEEK_SET:
-                        if (off >= 0) {
-                                file->pos = (aoff64_t) off;
-                                fibril_mutex_unlock(&file->lock);
-                                ipc_answer_1(rid, EOK, off);
-                                return;
-                        }
-                        break;
-                case SEEK_CUR:
-                        if ((off >= 0) && (file->pos + off < file->pos)) {
-                                fibril_mutex_unlock(&file->lock);
-                                ipc_answer_0(rid, EOVERFLOW);
-                                return;
-                        }
-                        
-                        if ((off < 0) && (file->pos < (aoff64_t) -off)) {
-                                fibril_mutex_unlock(&file->lock);
-                                ipc_answer_0(rid, EOVERFLOW);
-                                return;
-                        }
-                        
-                        file->pos += off;
-                        newoff = (file->pos > OFF64_MAX) ? OFF64_MAX : file->pos;
-                        
+        if (whence == SEEK_SET) {
+                file->pos = off;
+                fibril_mutex_unlock(&file->lock);
+                ipc_answer_1(rid, EOK, off);
+                return;
+        }
+        if (whence == SEEK_CUR) {
+                if (file->pos + off < file->pos) {
                         fibril_mutex_unlock(&file->lock);
-                        ipc_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff));
+                        ipc_answer_0(rid, EOVERFLOW);
                         return;
-                case SEEK_END:
-                        fibril_rwlock_read_lock(&file->node->contents_rwlock);
-                        aoff64_t size = file->node->size;
-                        
-                        if ((off >= 0) && (size + off < size)) {
-                                fibril_rwlock_read_unlock(&file->node->contents_rwlock);
-                                fibril_mutex_unlock(&file->lock);
-                                ipc_answer_0(rid, EOVERFLOW);
-                                return;
-                        }
-                        
-                        if ((off < 0) && (size < (aoff64_t) -off)) {
-                                fibril_rwlock_read_unlock(&file->node->contents_rwlock);
-                                fibril_mutex_unlock(&file->lock);
-                                ipc_answer_0(rid, EOVERFLOW);
-                                return;
-                        }
-                        
-                        file->pos = size + off;
-                        newoff = (file->pos > OFF64_MAX) ? OFF64_MAX : file->pos;
-                        
-                        fibril_rwlock_read_unlock(&file->node->contents_rwlock);
+                }
+                file->pos += off;
+                newpos = file->pos;
+                fibril_mutex_unlock(&file->lock);
+                ipc_answer_1(rid, EOK, newpos);
+                return;
+        }
+        if (whence == SEEK_END) {
+                fibril_rwlock_read_lock(&file->node->contents_rwlock);
+                size_t size = file->node->size;
+                fibril_rwlock_read_unlock(&file->node->contents_rwlock);
+                if (size + off < size) {
                         fibril_mutex_unlock(&file->lock);
-                        ipc_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff));
+                        ipc_answer_0(rid, EOVERFLOW);
                         return;
-        }
-        
+                }
+                newpos = size + off;
+                file->pos = newpos;
+                fibril_mutex_unlock(&file->lock);
+                ipc_answer_1(rid, EOK, newpos);
+                return;
+        }
         fibril_mutex_unlock(&file->lock);
         ipc_answer_0(rid, EINVAL);
 }
 
-int vfs_truncate_internal(fs_handle_t fs_handle, dev_handle_t dev_handle,
-    fs_index_t index, aoff64_t size)
+int
+vfs_truncate_internal(fs_handle_t fs_handle, dev_handle_t dev_handle,
+    fs_index_t index, size_t size)
 {
         ipcarg_t rc;
@@ -967 +941 @@
         
         fs_phone = vfs_grab_phone(fs_handle);
-        rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t) dev_handle,
-            (ipcarg_t) index, LOWER32(size), UPPER32(size));
+        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;
@@ -976 +950 @@
 {
         int fd = IPC_GET_ARG1(*request);
-        aoff64_t size =
-            (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(*request), IPC_GET_ARG3(*request));
+        size_t size = IPC_GET_ARG2(*request);
         int rc;
 
@@ -1034 +1007 @@
 {
         char *path;
-        int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL);
+        int rc = async_string_receive(&path, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -1088 +1061 @@
         
         char *path;
-        int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL);
+        int rc = async_string_receive(&path, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -1110 +1083 @@
         
         char *path;
-        int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL);
+        int rc = async_string_receive(&path, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -1145 +1118 @@
         /* Retrieve the old path. */
         char *old;
-        int rc = async_data_write_accept((void **) &old, true, 0, 0, 0, NULL);
+        int rc = async_string_receive(&old, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
@@ -1153 +1126 @@
         /* Retrieve the new path. */
         char *new;
-        rc = async_data_write_accept((void **) &new, true, 0, 0, 0, NULL);
+        rc = async_string_receive(&new, 0, NULL);
         if (rc != EOK) {
                 free(old);