Changes in uspace/lib/libblock/libblock.c [64bc4b6:0da4e41] in mainline

File:

• uspace/lib/libblock/libblock.c (modified) (7 diffs)

uspace/lib/libblock/libblock.c

@@ -47 +47 @@
 #include <as.h>
 #include <assert.h>
-#include <fibril_synch.h>
+#include <fibril_sync.h>
 #include <adt/list.h>
 #include <adt/hash_table.h>
@@ -87 +87 @@
 static int write_blocks(devcon_t *devcon, bn_t ba, size_t cnt);
 static int get_block_size(int dev_phone, size_t *bsize);
-static int get_num_blocks(int dev_phone, bn_t *nblocks);
 
 static devcon_t *devcon_search(dev_handle_t dev_handle)
@@ -198 +197 @@
         assert(devcon);
         
-        if (devcon->cache)
-                (void) block_cache_fini(dev_handle);
-
         devcon_remove(devcon);
 
         if (devcon->bb_buf)
                 free(devcon->bb_buf);
+
+        if (devcon->cache) {
+                hash_table_destroy(&devcon->cache->block_hash);
+                free(devcon->cache);
+        }
 
         munmap(devcon->comm_area, devcon->comm_size);
@@ -300 +301 @@
 
         devcon->cache = cache;
-        return EOK;
-}
-
-int block_cache_fini(dev_handle_t dev_handle)
-{
-        devcon_t *devcon = devcon_search(dev_handle);
-        cache_t *cache;
-        int rc;
-
-        if (!devcon)
-                return ENOENT;
-        if (!devcon->cache)
-                return EOK;
-        cache = devcon->cache;
-        
-        /*
-         * We are expecting to find all blocks for this device handle on the
-         * free list, i.e. the block reference count should be zero. Do not
-         * bother with the cache and block locks because we are single-threaded.
-         */
-        while (!list_empty(&cache->free_head)) {
-                block_t *b = list_get_instance(cache->free_head.next,
-                    block_t, free_link);
-
-                list_remove(&b->free_link);
-                if (b->dirty) {
-                        memcpy(devcon->comm_area, b->data, b->size);
-                        rc = write_blocks(devcon, b->boff, 1);
-                        if (rc != EOK)
-                                return rc;
-                }
-
-                long key = b->boff;
-                hash_table_remove(&cache->block_hash, &key, 1);
-                
-                free(b->data);
-                free(b);
-        }
-
-        hash_table_destroy(&cache->block_hash);
-        devcon->cache = NULL;
-        free(cache);
-
         return EOK;
 }
@@ -756 +714 @@
 
         memcpy(devcon->comm_area, data, devcon->pblock_size * cnt);
-        rc = write_blocks(devcon, ba, cnt);
+        rc = read_blocks(devcon, ba, cnt);
 
         fibril_mutex_unlock(&devcon->comm_area_lock);
@@ -778 +736 @@
         
         return get_block_size(devcon->dev_phone, bsize);
-}
-
-/** Get number of blocks on device.
- *
- * @param dev_handle    Device handle of the block device.
- * @param nblocks       Output number of blocks.
- *
- * @return              EOK on success or negative error code on failure.
- */
-int block_get_nblocks(dev_handle_t dev_handle, bn_t *nblocks)
-{
-        devcon_t *devcon;
-
-        devcon = devcon_search(dev_handle);
-        assert(devcon);
-        
-        return get_num_blocks(devcon->dev_phone, nblocks);
 }
 
@@ -848 +789 @@
 }
 
-/** Get total number of blocks on block device. */
-static int get_num_blocks(int dev_phone, bn_t *nblocks)
-{
-        ipcarg_t nb_l, nb_h;
-        int rc;
-
-        rc = async_req_0_2(dev_phone, BD_GET_NUM_BLOCKS, &nb_l, &nb_h);
-        if (rc == EOK) {
-                *nblocks = (bn_t) MERGE_LOUP32(nb_l, nb_h);
-        }
-
-        return rc;
-}
-
 /** @}
  */