Changes in uspace/srv/fs/fat/fat_ops.c [19f857a:472c09d] in mainline

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (11 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -45 +45 @@
 #include <ipc/services.h>
 #include <ipc/devmap.h>
-#include <macros.h>
 #include <async.h>
 #include <errno.h>
-#include <str.h>
+#include <string.h>
 #include <byteorder.h>
 #include <adt/hash_table.h>
@@ -80 +79 @@
 static int fat_has_children(bool *, fs_node_t *);
 static fs_index_t fat_index_get(fs_node_t *);
-static aoff64_t fat_size_get(fs_node_t *);
+static size_t fat_size_get(fs_node_t *);
 static unsigned fat_lnkcnt_get(fs_node_t *);
 static char fat_plb_get_char(unsigned);
@@ -723 +722 @@
         fibril_mutex_lock(&childp->idx->lock);
         
-        if (childp->type == FAT_DIRECTORY) {
+        /*
+         * If possible, create the Sub-directory Identifier Entry and the
+         * Sub-directory Parent Pointer Entry (i.e. "." and ".."). These entries
+         * are not mandatory according to Standard ECMA-107 and HelenOS VFS does
+         * not use them anyway, so this is rather a sign of our good will.
+         */
+        rc = fat_block_get(&b, bs, childp, 0, BLOCK_FLAGS_NONE);
+        if (rc != EOK) {
                 /*
-                 * If possible, create the Sub-directory Identifier Entry and
-                 * the Sub-directory Parent Pointer Entry (i.e. "." and "..").
-                 * These entries are not mandatory according to Standard
-                 * ECMA-107 and HelenOS VFS does not use them anyway, so this is
-                 * rather a sign of our good will.
+                 * Rather than returning an error, simply skip the creation of
+                 * these two entries.
                  */
-                rc = fat_block_get(&b, bs, childp, 0, BLOCK_FLAGS_NONE);
-                if (rc != EOK) {
-                        /*
-                         * Rather than returning an error, simply skip the
-                         * creation of these two entries.
-                         */
-                        goto skip_dots;
-                }
-                d = (fat_dentry_t *) b->data;
-                if ((fat_classify_dentry(d) == FAT_DENTRY_LAST) ||
-                    (str_cmp((char *) d->name, FAT_NAME_DOT)) == 0) {
-                        memset(d, 0, sizeof(fat_dentry_t));
-                        str_cpy((char *) d->name, 8, FAT_NAME_DOT);
-                        str_cpy((char *) d->ext, 3, FAT_EXT_PAD);
-                        d->attr = FAT_ATTR_SUBDIR;
-                        d->firstc = host2uint16_t_le(childp->firstc);
-                        /* TODO: initialize also the date/time members. */
-                }
-                d++;
-                if ((fat_classify_dentry(d) == FAT_DENTRY_LAST) ||
-                    (str_cmp((char *) d->name, FAT_NAME_DOT_DOT) == 0)) {
-                        memset(d, 0, sizeof(fat_dentry_t));
-                        str_cpy((char *) d->name, 8, FAT_NAME_DOT_DOT);
-                        str_cpy((char *) d->ext, 3, FAT_EXT_PAD);
-                        d->attr = FAT_ATTR_SUBDIR;
-                        d->firstc = (parentp->firstc == FAT_CLST_ROOT) ?
-                            host2uint16_t_le(FAT_CLST_RES0) :
-                            host2uint16_t_le(parentp->firstc);
-                        /* TODO: initialize also the date/time members. */
-                }
-                b->dirty = true;                /* need to sync block */
-                /*
-                 * Ignore the return value as we would have fallen through on error
-                 * anyway.
-                 */
-                (void) block_put(b);
-        }
+                goto skip_dots;
+        }
+        d = (fat_dentry_t *)b->data;
+        if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
+            str_cmp(d->name, FAT_NAME_DOT) == 0) {
+                memset(d, 0, sizeof(fat_dentry_t));
+                str_cpy(d->name, 8, FAT_NAME_DOT);
+                str_cpy(d->ext, 3, FAT_EXT_PAD);
+                d->attr = FAT_ATTR_SUBDIR;
+                d->firstc = host2uint16_t_le(childp->firstc);
+                /* TODO: initialize also the date/time members. */
+        }
+        d++;
+        if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
+            str_cmp(d->name, FAT_NAME_DOT_DOT) == 0) {
+                memset(d, 0, sizeof(fat_dentry_t));
+                str_cpy(d->name, 8, FAT_NAME_DOT_DOT);
+                str_cpy(d->ext, 3, FAT_EXT_PAD);
+                d->attr = FAT_ATTR_SUBDIR;
+                d->firstc = (parentp->firstc == FAT_CLST_ROOT) ?
+                    host2uint16_t_le(FAT_CLST_RES0) :
+                    host2uint16_t_le(parentp->firstc);
+                /* TODO: initialize also the date/time members. */
+        }
+        b->dirty = true;                /* need to sync block */
+        /*
+         * Ignore the return value as we would have fallen through on error
+         * anyway.
+         */
+        (void) block_put(b);
 skip_dots:
 
@@ -916 +912 @@
 }
 
-aoff64_t fat_size_get(fs_node_t *fn)
+size_t fat_size_get(fs_node_t *fn)
 {
         return FAT_NODE(fn)->size;
@@ -981 +977 @@
         /* Accept the mount options */
         char *opts;
-        int rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL);
+        int rc = async_string_receive(&opts, 0, NULL);
         
         if (rc != EOK) {
@@ -1158 +1154 @@
 void fat_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);
-        aoff64_t pos =
-            (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*request), IPC_GET_ARG4(*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);
         fs_node_t *fn;
         fat_node_t *nodep;
@@ -1225 +1220 @@
         } else {
                 unsigned bnum;
-                aoff64_t spos = pos;
+                off_t spos = pos;
                 char name[FAT_NAME_LEN + 1 + FAT_EXT_LEN + 1];
                 fat_dentry_t *d;
@@ -1241 +1236 @@
                 bnum = (pos * sizeof(fat_dentry_t)) / bps;
                 while (bnum < nodep->size / bps) {
-                        aoff64_t o;
+                        off_t o;
 
                         rc = fat_block_get(&b, bs, nodep, bnum,
@@ -1297 +1292 @@
 void fat_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);
-        aoff64_t pos =
-            (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*request), IPC_GET_ARG4(*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);
         fs_node_t *fn;
         fat_node_t *nodep;
@@ -1309 +1303 @@
         unsigned spc;
         unsigned bpc;           /* bytes per cluster */
-        aoff64_t boundary;
+        off_t boundary;
         int flags = BLOCK_FLAGS_NONE;
         int rc;
@@ -1455 +1449 @@
 void fat_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));
+        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);
         fs_node_t *fn;
         fat_node_t *nodep;