Changes in uspace/lib/block/block.c [c1f26834:dd8b6a8] in mainline

File:

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

uspace/lib/block/block.c

@@ -194 +194 @@
         if (devcon->cache)
                 (void) block_cache_fini(service_id);
+        
+        (void)bd_sync_cache(devcon->bd, 0, 0);
         
         devcon_remove(devcon);
@@ -877 +879 @@
  *
  * @return Allocated TOC structure.
- * @return NULL on failure.
- *
- */
-toc_block_t *block_get_toc(service_id_t service_id, uint8_t session)
+ * @return EOK on success or negative error code.
+ *
+ */
+int block_read_toc(service_id_t service_id, uint8_t session, void *buf,
+    size_t bufsize)
 {
         devcon_t *devcon = devcon_search(service_id);
-        toc_block_t *toc = NULL;
-        int rc;
-        
-        assert(devcon);
-        
-        toc = (toc_block_t *) malloc(sizeof(toc_block_t));
-        if (toc == NULL)
-                return NULL;
-        
-        rc = bd_read_toc(devcon->bd, session, toc, sizeof(toc_block_t));
-        if (rc != EOK) {
-                free(toc);
-                return NULL;
-        }
-        
-        return toc;
+        
+        assert(devcon);
+        return bd_read_toc(devcon->bd, session, buf, bufsize);
 }