Changes in uspace/srv/fs/fat/fat_idx.c [19f857a:9a15176] in mainline

File:

• uspace/srv/fs/fat/fat_idx.c (modified) (7 diffs)

uspace/srv/fs/fat/fat_idx.c

@@ -39 +39 @@
 #include "../../vfs/vfs.h"
 #include <errno.h>
-#include <str.h>
+#include <string.h>
 #include <adt/hash_table.h>
 #include <adt/list.h>
 #include <assert.h>
-#include <fibril_synch.h>
+#include <fibril_sync.h>
 
 /** Each instance of this type describes one interval of freed VFS indices. */
@@ -149 +149 @@
 {
         dev_handle_t dev_handle = (dev_handle_t)key[UPH_DH_KEY];
-        fat_cluster_t pfc;
-        unsigned pdi;
+        fat_cluster_t pfc = (fat_cluster_t)key[UPH_PFC_KEY];
+        unsigned pdi = (unsigned)key[UPH_PDI_KEY];
         fat_idx_t *fidx = list_get_instance(item, fat_idx_t, uph_link);
 
-        switch (keys) {
-        case 1:
-                return (dev_handle == fidx->dev_handle);
-        case 3:
-                pfc = (fat_cluster_t) key[UPH_PFC_KEY];
-                pdi = (unsigned) key[UPH_PDI_KEY];
-                return (dev_handle == fidx->dev_handle) && (pfc == fidx->pfc) &&
-                    (pdi == fidx->pdi);
-        default:
-                assert((keys == 1) || (keys == 3));
-        }
-
-        return 0;
+        return (dev_handle == fidx->dev_handle) && (pfc == fidx->pfc) &&
+            (pdi == fidx->pdi);
 }
 
@@ -208 +197 @@
 {
         dev_handle_t dev_handle = (dev_handle_t)key[UIH_DH_KEY];
-        fs_index_t index;
+        fs_index_t index = (fs_index_t)key[UIH_INDEX_KEY];
         fat_idx_t *fidx = list_get_instance(item, fat_idx_t, uih_link);
 
-        switch (keys) {
-        case 1:
-                return (dev_handle == fidx->dev_handle);
-        case 2:
-                index = (fs_index_t) key[UIH_INDEX_KEY];
-                return (dev_handle == fidx->dev_handle) &&
-                    (index == fidx->index);
-        default:
-                assert((keys == 1) || (keys == 2));
-        }
-
-        return 0;
+        return (dev_handle == fidx->dev_handle) && (index == fidx->index);
 }
 
 static void idx_remove_callback(link_t *item)
 {
-        fat_idx_t *fidx = list_get_instance(item, fat_idx_t, uih_link);
-
-        free(fidx);
+        /* nothing to do */
 }
 
@@ -510 +486 @@
                 [UIH_INDEX_KEY] = idx->index,
         };
-        dev_handle_t dev_handle = idx->dev_handle;
-        fs_index_t index = idx->index;
 
         assert(idx->pfc == FAT_CLST_RES0);
@@ -524 +498 @@
         fibril_mutex_unlock(&used_lock);
         /* Release the VFS index. */
-        fat_index_free(dev_handle, index);
-        /* The index structure itself is freed in idx_remove_callback(). */
+        fat_index_free(idx->dev_handle, idx->index);
+        /* Deallocate the structure. */
+        free(idx);
 }
 
@@ -556 +531 @@
         unused_initialize(u, dev_handle);
         fibril_mutex_lock(&unused_lock);
-        if (!unused_find(dev_handle, false)) {
+        if (!unused_find(dev_handle, false))
                 list_append(&u->link, &unused_head);
-        } else {
-                free(u);
+        else
                 rc = EEXIST;
-        }
         fibril_mutex_unlock(&unused_lock);
         return rc;
@@ -568 +541 @@
 void fat_idx_fini_by_dev_handle(dev_handle_t dev_handle)
 {
-        unsigned long ikey[] = {
-                [UIH_DH_KEY] = dev_handle
-        };
-        unsigned long pkey[] = {
-                [UPH_DH_KEY] = dev_handle
-        };
-
-        /*
-         * Remove this instance's index structure from up_hash and ui_hash.
-         * Process up_hash first and ui_hash second because the index structure
-         * is actually removed in idx_remove_callback(). 
-         */
-        fibril_mutex_lock(&used_lock);
-        hash_table_remove(&up_hash, pkey, 1);
-        hash_table_remove(&ui_hash, ikey, 1);
-        fibril_mutex_unlock(&used_lock);
-
-        /*
-         * Free the unused and freed structures for this instance.
-         */
-        unused_t *u = unused_find(dev_handle, true);
+        unused_t *u;
+
+        u = unused_find(dev_handle, true);
         assert(u);
         list_remove(&u->link);