Changes in uspace/lib/block/libblock.c [956d4df8:96b02eb9] in mainline

File:

• uspace/lib/block/libblock.c (modified) (9 diffs)

uspace/lib/block/libblock.c

@@ -44 +44 @@
 #include <sys/mman.h>
 #include <async.h>
+#include <ipc/ipc.h>
 #include <as.h>
 #include <assert.h>
@@ -176 +177 @@
         if (rc != EOK) {
                 munmap(comm_area, comm_size);
-                async_hangup(dev_phone);
+                ipc_hangup(dev_phone);
                 return rc;
         }
@@ -182 +183 @@
         if (get_block_size(dev_phone, &bsize) != EOK) {
                 munmap(comm_area, comm_size);
-                async_hangup(dev_phone);
+                ipc_hangup(dev_phone);
                 return rc;
         }
@@ -189 +190 @@
         if (rc != EOK) {
                 munmap(comm_area, comm_size);
-                async_hangup(dev_phone);
+                ipc_hangup(dev_phone);
                 return rc;
         }
@@ -210 +211 @@
 
         munmap(devcon->comm_area, devcon->comm_size);
-        async_hangup(devcon->dev_phone);
+        ipc_hangup(devcon->dev_phone);
 
         free(devcon);   
@@ -294 +295 @@
 
         /* Allow 1:1 or small-to-large block size translation */
-        if (cache->lblock_size % devcon->pblock_size != 0) {
-                free(cache);
+        if (cache->lblock_size % devcon->pblock_size != 0)
                 return ENOTSUP;
-        }
 
         cache->blocks_cluster = cache->lblock_size / devcon->pblock_size;
@@ -438 +437 @@
                         if (!b->data) {
                                 free(b);
-                                b = NULL;
                                 goto recycle;
                         }
@@ -566 +564 @@
         assert(devcon);
         assert(devcon->cache);
-        assert(block->refcnt >= 1);
 
         cache = devcon->cache;
@@ -626 +623 @@
                         unsigned long key = block->lba;
                         hash_table_remove(&cache->block_hash, &key, 1);
-                        fibril_mutex_unlock(&block->lock);
+                        free(block);
                         free(block->data);
-                        free(block);
                         cache->blocks_cached--;
                         fibril_mutex_unlock(&cache->lock);