Changes in uspace/lib/block/libblock.c [ffa2c8ef:0f1cf7a] in mainline

File:

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

uspace/lib/block/libblock.c

@@ -294 +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;
@@ -436 +438 @@
                         if (!b->data) {
                                 free(b);
+                                b = NULL;
                                 goto recycle;
                         }
@@ -563 +566 @@
         assert(devcon);
         assert(devcon->cache);
+        assert(block->refcnt >= 1);
 
         cache = devcon->cache;
@@ -622 +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);