Changes in uspace/lib/block/block.c [f9b2cb4c:4e00f87] in mainline

File:

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

uspace/lib/block/block.c

@@ -37 +37 @@
  */
 
+#include "../../srv/vfs/vfs.h"
 #include <ipc/loc.h>
 #include <ipc/services.h>
 #include <errno.h>
+#include <sys/mman.h>
 #include <async.h>
 #include <as.h>
@@ -55 +57 @@
 #include "block.h"
 
-#define MAX_WRITE_RETRIES 10
-
 /** Lock protecting the device connection list */
 static FIBRIL_MUTEX_INITIALIZE(dcl_lock);
@@ -81 +81 @@
         void *bb_buf;
         aoff64_t bb_addr;
-        aoff64_t pblocks;    /**< Number of physical blocks */
         size_t pblock_size;  /**< Physical block size. */
         cache_t *cache;
@@ -94 +93 @@
         fibril_mutex_lock(&dcl_lock);
         
-        list_foreach(dcl, link, devcon_t, devcon) {
+        list_foreach(dcl, cur) {
+                devcon_t *devcon = list_get_instance(cur, devcon_t, link);
                 if (devcon->service_id == service_id) {
                         fibril_mutex_unlock(&dcl_lock);
@@ -106 +106 @@
 
 static int devcon_add(service_id_t service_id, async_sess_t *sess,
-    size_t bsize, aoff64_t dev_size, bd_t *bd)
+    size_t bsize, bd_t *bd)
 {
         devcon_t *devcon;
@@ -121 +121 @@
         devcon->bb_addr = 0;
         devcon->pblock_size = bsize;
-        devcon->pblocks = dev_size;
         devcon->cache = NULL;
         
         fibril_mutex_lock(&dcl_lock);
-        list_foreach(dcl, link, devcon_t, d) {
+        list_foreach(dcl, cur) {
+                devcon_t *d = list_get_instance(cur, devcon_t, link);
                 if (d->service_id == service_id) {
                         fibril_mutex_unlock(&dcl_lock);
@@ -144 +144 @@
 }
 
-int block_init(service_id_t service_id, size_t comm_size)
+int block_init(exch_mgmt_t mgmt, service_id_t service_id,
+    size_t comm_size)
 {
         bd_t *bd;
 
-        async_sess_t *sess = loc_service_connect(service_id, INTERFACE_BLOCK,
+        async_sess_t *sess = loc_service_connect(mgmt, service_id,
             IPC_FLAG_BLOCKING);
         if (!sess) {
@@ -167 +168 @@
                 return rc;
         }
-
-        aoff64_t dev_size;
-        rc = bd_get_num_blocks(bd, &dev_size);
+        
+        rc = devcon_add(service_id, sess, bsize, bd);
         if (rc != EOK) {
                 bd_close(bd);
@@ -176 +176 @@
         }
         
-        rc = devcon_add(service_id, sess, bsize, dev_size, bd);
-        if (rc != EOK) {
-                bd_close(bd);
-                async_hangup(sess);
-                return rc;
-        }
-        
         return EOK;
 }
@@ -193 +186 @@
         if (devcon->cache)
                 (void) block_cache_fini(service_id);
-        
-        (void)bd_sync_cache(devcon->bd, 0, 0);
         
         devcon_remove(devcon);
@@ -362 +353 @@
         fibril_mutex_initialize(&b->lock);
         b->refcnt = 1;
-        b->write_failures = 0;
         b->dirty = false;
         b->toxic = false;
@@ -387 +377 @@
         block_t *b;
         link_t *link;
-        aoff64_t p_ba;
+
         int rc;
         
@@ -396 +386 @@
         
         cache = devcon->cache;
-
-        /* Check whether the logical block (or part of it) is beyond
-         * the end of the device or not.
-         */
-        p_ba = ba_ltop(devcon, ba);
-        p_ba += cache->blocks_cluster;
-        if (p_ba >= devcon->pblocks) {
-                /* This request cannot be satisfied */
-                return EIO;
-        }
-
 
 retry:
@@ -483 +462 @@
                                          * another block next time.
                                          */
-                                        if (b->write_failures < MAX_WRITE_RETRIES) {
-                                                b->write_failures++;
-                                                fibril_mutex_unlock(&b->lock);
-                                                goto retry;
-                                        } else {
-                                                printf("Too many errors writing block %"
-                                                    PRIuOFF64 "from device handle %" PRIun "\n"
-                                                    "SEVERE DATA LOSS POSSIBLE\n",
-                                                    b->lba, devcon->service_id);
-                                        }
-                                } else
-                                        b->write_failures = 0;
-
+                                        fibril_mutex_unlock(&b->lock);
+                                        goto retry;
+                                }
                                 b->dirty = false;
                                 if (!fibril_mutex_trylock(&cache->lock)) {
@@ -612 +581 @@
                 rc = write_blocks(devcon, block->pba, cache->blocks_cluster,
                     block->data, block->size);
-                if (rc == EOK)
-                        block->write_failures = 0;
                 block->dirty = false;
         }
@@ -639 +606 @@
                                  */
                                 block->refcnt++;
-
-                                if (block->write_failures < MAX_WRITE_RETRIES) {
-                                        block->write_failures++;
-                                        fibril_mutex_unlock(&block->lock);
-                                        fibril_mutex_unlock(&cache->lock);
-                                        goto retry;
-                                } else {
-                                        printf("Too many errors writing block %"
-                                            PRIuOFF64 "from device handle %" PRIun "\n"
-                                            "SEVERE DATA LOSS POSSIBLE\n",
-                                            block->lba, devcon->service_id);
-                                }
+                                fibril_mutex_unlock(&block->lock);
+                                fibril_mutex_unlock(&cache->lock);
+                                goto retry;
                         }
                         /*
@@ -816 +774 @@
         devcon_t *devcon = devcon_search(service_id);
         assert(devcon);
-
+        
         return bd_get_num_blocks(devcon->bd, nblocks);
 }
@@ -878 +836 @@
  *
  * @return Allocated TOC structure.
- * @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)
+ * @return NULL on failure.
+ *
+ */
+toc_block_t *block_get_toc(service_id_t service_id, uint8_t session)
 {
         devcon_t *devcon = devcon_search(service_id);
-        
-        assert(devcon);
-        return bd_read_toc(devcon->bd, session, buf, bufsize);
+        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;
 }