WebSVN – HelenOS – Diff – /trunk/uspace/srv/fs/tmpfs/tmpfs_ops.c

  * Implementation of the libfs interface.
  */
 /* Forward declarations of static functions. */
 static bool tmpfs_match(void *, void *, const char *);
-static void *tmpfs_node_get(int, int, unsigned long);
+static void *tmpfs_node_get(fs_handle_t, dev_handle_t, fs_index_t);
 static void *tmpfs_create_node(int);
 static bool tmpfs_link_node(void *, void *, const char *);
 static int tmpfs_unlink_node(void *, void *);
 static void tmpfs_destroy_node(void *);
 /* Implementation of helper functions. */
-static unsigned long tmpfs_index_get(void *nodep)
+static fs_index_t tmpfs_index_get(void *nodep)
+{
     return ((tmpfs_dentry_t *) nodep)->index;
+}
-static unsigned long tmpfs_size_get(void *nodep)
+static size_t tmpfs_size_get(void *nodep)
+{
     return ((tmpfs_dentry_t *) nodep)->size;
+}
 static unsigned tmpfs_lnkcnt_get(void *nodep)
     .hash = dentries_hash,
     .compare = dentries_compare,
     .remove_callback = dentries_remove_callback
 };
-unsigned tmpfs_next_index = 1;
+fs_index_t tmpfs_next_index = 1;
 typedef struct {
     char *name;
     tmpfs_dentry_t *parent;
     link_t link;
     tmpfs_name_t *namep = hash_table_get_instance(hlp, tmpfs_name_t, link);
     return !strcmp(namep->name, component);
+}
+void *
-void *tmpfs_node_get(int fs_handle, int dev_handle, unsigned long index)
+tmpfs_node_get(fs_handle_t fs_handle, dev_handle_t dev_handle, fs_index_t index)
+{
+    unsigned long key = index;
-    link_t *lnk = hash_table_find(&dentries, &index);
+    link_t *lnk = hash_table_find(&dentries, &key);
     if (!lnk)
         return NULL;
     return hash_table_get_instance(lnk, tmpfs_dentry_t, dh_link);
+}
         node->type = TMPFS_DIRECTORY;
     else
         node->type = TMPFS_FILE;
     /* Insert the new node into the dentry hash table. */
+    unsigned long key = node->index;
-    hash_table_insert(&dentries, &node->index, &node->dh_link);
+    hash_table_insert(&dentries, &key, &node->dh_link);
     return (void *) node;
+}
 bool tmpfs_link_node(void *prnt, void *chld, const char *nm)
+{
     assert(!dentry->lnkcnt);
     assert(!dentry->child);
     assert(!dentry->sibling);
-    unsigned long index = dentry->index;
+    unsigned long key = dentry->index;
-    hash_table_remove(&dentries, &index, 1);
+    hash_table_remove(&dentries, &key, 1);
     hash_table_destroy(&dentry->names);
     if (dentry->type == TMPFS_FILE)
         free(dentry->data);
     libfs_lookup(&tmpfs_libfs_ops, tmpfs_reg.fs_handle, rid, request);
+}
 void tmpfs_read(ipc_callid_t rid, ipc_call_t *request)
+{
-    int dev_handle = IPC_GET_ARG1(*request);
+    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    unsigned long index = IPC_GET_ARG2(*request);
+    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-    off_t pos = IPC_GET_ARG3(*request);
+    off_t pos = (off_t)IPC_GET_ARG3(*request);
     /*
      * Lookup the respective dentry.
      */
     link_t *hlp;
+    unsigned long key = index;
-    hlp = hash_table_find(&dentries, &index);
+    hlp = hash_table_find(&dentries, &key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
+    }
     tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
     ipc_answer_1(rid, EOK, bytes);
+}
 void tmpfs_write(ipc_callid_t rid, ipc_call_t *request)
+{
-    int dev_handle = IPC_GET_ARG1(*request);
+    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    unsigned long index = IPC_GET_ARG2(*request);
+    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-    off_t pos = IPC_GET_ARG3(*request);
+    off_t pos = (off_t)IPC_GET_ARG3(*request);
     /*
      * Lookup the respective dentry.
      */
     link_t *hlp;
+    unsigned long key = index;
-    hlp = hash_table_find(&dentries, &index);
+    hlp = hash_table_find(&dentries, &key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
+    }
     tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
     ipc_answer_2(rid, EOK, len, dentry->size);
+}
 void tmpfs_truncate(ipc_callid_t rid, ipc_call_t *request)
+{
-    int dev_handle = IPC_GET_ARG1(*request);
+    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    unsigned long index = IPC_GET_ARG2(*request);
+    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
-    size_t size = IPC_GET_ARG3(*request);
+    size_t size = (off_t)IPC_GET_ARG3(*request);
     /*
      * Lookup the respective dentry.
      */
     link_t *hlp;
+    unsigned long key = index;
-    hlp = hash_table_find(&dentries, &index);
+    hlp = hash_table_find(&dentries, &key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
+    }
     tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
     ipc_answer_0(rid, EOK);
+}
 void tmpfs_destroy(ipc_callid_t rid, ipc_call_t *request)
+{
-    int dev_handle = IPC_GET_ARG1(*request);
+    dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    unsigned long index = IPC_GET_ARG2(*request);
+    fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
     link_t *hlp;
+    unsigned long key = index;
-    hlp = hash_table_find(&dentries, &index);
+    hlp = hash_table_find(&dentries, &key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
+    }
     tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,

Subversion Repositories HelenOS

(root)/trunk/uspace/srv/fs/tmpfs/tmpfs_ops.c – Rev 2763 → 2770