Changeset cf2af94 in mainline for uspace/lib/block/libblock.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/lib/block/libblock.c (modified) (11 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>
@@ -177 +176 @@
         if (rc != EOK) {
                 munmap(comm_area, comm_size);
-                ipc_hangup(dev_phone);
+                async_hangup(dev_phone);
                 return rc;
         }
@@ -183 +182 @@
         if (get_block_size(dev_phone, &bsize) != EOK) {
                 munmap(comm_area, comm_size);
-                ipc_hangup(dev_phone);
+                async_hangup(dev_phone);
                 return rc;
         }
@@ -190 +189 @@
         if (rc != EOK) {
                 munmap(comm_area, comm_size);
-                ipc_hangup(dev_phone);
+                async_hangup(dev_phone);
                 return rc;
         }
@@ -211 +210 @@
 
         munmap(devcon->comm_area, devcon->comm_size);
-        ipc_hangup(devcon->dev_phone);
+        async_hangup(devcon->dev_phone);
 
         free(devcon);   
@@ -295 +294 @@
 
         /* Allow 1:1 or small-to-large block size translation */
-        if (cache->lblock_size % devcon->pblock_size != 0)
+        if (cache->lblock_size % devcon->pblock_size != 0) {
+                free(cache);
                 return ENOTSUP;
+        }
 
         cache->blocks_cluster = cache->lblock_size / devcon->pblock_size;
@@ -437 +438 @@
                         if (!b->data) {
                                 free(b);
+                                b = NULL;
                                 goto recycle;
                         }
@@ -564 +566 @@
         assert(devcon);
         assert(devcon->cache);
+        assert(block->refcnt >= 1);
 
         cache = devcon->cache;
@@ -623 +626 @@
                         unsigned long key = block->lba;
                         hash_table_remove(&cache->block_hash, &key, 1);
+                        free(block->data);
                         free(block);
-                        free(block->data);
                         cache->blocks_cached--;
                         fibril_mutex_unlock(&cache->lock);
@@ -862 +865 @@
 static int get_block_size(int dev_phone, size_t *bsize)
 {
-        ipcarg_t bs;
+        sysarg_t bs;
         int rc;
 
@@ -875 +878 @@
 static int get_num_blocks(int dev_phone, aoff64_t *nblocks)
 {
-        ipcarg_t nb_l, nb_h;
+        sysarg_t nb_l, nb_h;
         int rc;