Changes in uspace/srv/fs/tmpfs/tmpfs_ops.c [1715b6af:ed903174] in mainline

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (15 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -29 +29 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 /**
@@ -40 +40 @@
 #include "../../vfs/vfs.h"
 #include <ipc/ipc.h>
+#include <macros.h>
+#include <limits.h>
 #include <async.h>
 #include <errno.h>
@@ -93 +95 @@
 }
 
-static size_t tmpfs_size_get(fs_node_t *fn)
+static aoff64_t tmpfs_size_get(fs_node_t *fn)
 {
         return TMPFS_NODE(fn)->size;
@@ -168 +170 @@
                     (nodep->index == key[NODES_KEY_INDEX]));
         default:
-                abort();
-        }
+                assert((keys == 1) || (keys == 2));
+        }
+
+        return 0;
 }
 
@@ -439 +443 @@
 {
         dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+        fs_node_t *rootfn;
         int rc;
-
-        /* accept the mount options */
-        ipc_callid_t callid;
-        size_t size;
-        if (!async_data_write_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-        char *opts = malloc(size + 1);
-        if (!opts) {
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
-                return;
-        }
-        ipcarg_t retval = async_data_write_finalize(callid, opts, size);
-        if (retval != EOK) {
-                ipc_answer_0(rid, retval);
+        
+        /* Accept the mount options. */
+        char *opts;
+        rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL);
+        if (rc != EOK) {
+                ipc_answer_0(rid, rc);
+                return;
+        }
+
+        /* Check if this device is not already mounted. */
+        rc = tmpfs_root_get(&rootfn, dev_handle);
+        if ((rc == EOK) && (rootfn)) {
+                (void) tmpfs_node_put(rootfn);
                 free(opts);
-                return;
-        }
-        opts[size] = '\0';
+                ipc_answer_0(rid, EEXIST);
+                return;
+        }
 
         /* Initialize TMPFS instance. */
@@ -470 +470 @@
         }
 
-        fs_node_t *rootfn;
         rc = tmpfs_root_get(&rootfn, dev_handle);
         assert(rc == EOK);
@@ -512 +511 @@
 void tmpfs_read(ipc_callid_t rid, ipc_call_t *request)
 {
-        dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-        fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-        off_t pos = (off_t)IPC_GET_ARG3(*request);
-
+        dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
+        aoff64_t pos =
+            (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*request), IPC_GET_ARG4(*request));
+        
         /*
          * Lookup the respective TMPFS node.
@@ -531 +531 @@
         tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
             nh_link);
-
+        
         /*
          * Receive the read request.
@@ -538 +538 @@
         size_t size;
         if (!async_data_read_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);   
+                ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
                 return;
@@ -545 +545 @@
         size_t bytes;
         if (nodep->type == TMPFS_FILE) {
-                bytes = max(0, min(nodep->size - pos, size));
+                bytes = min(nodep->size - pos, size);
                 (void) async_data_read_finalize(callid, nodep->data + pos,
                     bytes);
@@ -551 +551 @@
                 tmpfs_dentry_t *dentryp;
                 link_t *lnk;
-                int i;
+                aoff64_t i;
                 
                 assert(nodep->type == TMPFS_DIRECTORY);
@@ -561 +561 @@
                  */
                 for (i = 0, lnk = nodep->cs_head.next;
-                    i < pos && lnk != &nodep->cs_head;
+                    (i < pos) && (lnk != &nodep->cs_head);
                     i++, lnk = lnk->next)
                         ;
@@ -586 +586 @@
 void tmpfs_write(ipc_callid_t rid, ipc_call_t *request)
 {
-        dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-        fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-        off_t pos = (off_t)IPC_GET_ARG3(*request);
-
+        dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
+        aoff64_t pos =
+            (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*request), IPC_GET_ARG4(*request));
+        
         /*
          * Lookup the respective TMPFS node.
@@ -650 +651 @@
 void tmpfs_truncate(ipc_callid_t rid, ipc_call_t *request)
 {
+        dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
+        aoff64_t size =
+            (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*request), IPC_GET_ARG4(*request));
+        
+        /*
+         * Lookup the respective TMPFS node.
+         */
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = dev_handle,
+                [NODES_KEY_INDEX] = index
+        };
+        link_t *hlp = hash_table_find(&nodes, key);
+        if (!hlp) {
+                ipc_answer_0(rid, ENOENT);
+                return;
+        }
+        tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
+            nh_link);
+        
+        if (size == nodep->size) {
+                ipc_answer_0(rid, EOK);
+                return;
+        }
+        
+        if (size > SIZE_MAX) {
+                ipc_answer_0(rid, ENOMEM);
+                return;
+        }
+        
+        void *newdata = realloc(nodep->data, size);
+        if (!newdata) {
+                ipc_answer_0(rid, ENOMEM);
+                return;
+        }
+        
+        if (size > nodep->size) {
+                size_t delta = size - nodep->size;
+                memset(newdata + nodep->size, 0, delta);
+        }
+        
+        nodep->size = size;
+        nodep->data = newdata;
+        ipc_answer_0(rid, EOK);
+}
+
+void tmpfs_close(ipc_callid_t rid, ipc_call_t *request)
+{
+        ipc_answer_0(rid, EOK);
+}
+
+void tmpfs_destroy(ipc_callid_t rid, ipc_call_t *request)
+{
         dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
         fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-        size_t size = (off_t)IPC_GET_ARG3(*request);
-
-        /*
-         * Lookup the respective TMPFS node.
-         */
+        int rc;
+
         link_t *hlp;
         unsigned long key[] = {
@@ -669 +720 @@
         tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
             nh_link);
-
-        if (size == nodep->size) {
-                ipc_answer_0(rid, EOK);
-                return;
-        }
-
-        void *newdata = realloc(nodep->data, size);
-        if (!newdata) {
-                ipc_answer_0(rid, ENOMEM);
-                return;
-        }
-        if (size > nodep->size) {
-                size_t delta = size - nodep->size;
-                memset(newdata + nodep->size, 0, delta);
-        }
-        nodep->size = size;
-        nodep->data = newdata;
-        ipc_answer_0(rid, EOK);
-}
-
-void tmpfs_close(ipc_callid_t rid, ipc_call_t *request)
-{
-        ipc_answer_0(rid, EOK);
-}
-
-void tmpfs_destroy(ipc_callid_t rid, ipc_call_t *request)
-{
-        dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-        fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-        int rc;
-
-        link_t *hlp;
-        unsigned long key[] = {
-                [NODES_KEY_DEV] = dev_handle,
-                [NODES_KEY_INDEX] = index
-        };
-        hlp = hash_table_find(&nodes, key);
-        if (!hlp) {
-                ipc_answer_0(rid, ENOENT);
-                return;
-        }
-        tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
-            nh_link);
         rc = tmpfs_destroy_node(FS_NODE(nodep));
         ipc_answer_0(rid, rc);