Changeset 2e07f62c in mainline for uspace/lib/libblock/libblock.c

Timestamp:

2010-01-31T18:11:24Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1735f3e, 7d6f7d2b

Parents:

ab4bace (diff), 430de97 (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 progress from the file system branch allowing FAT to be unmounted.

File:

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

uspace/lib/libblock/libblock.c

@@ -198 +198 @@
         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);
@@ -302 +300 @@
 
         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;
 }