Changeset 95c675b in mainline for uspace/srv/bd/vbd/disk.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• uspace/srv/bd/vbd/disk.c (modified) (14 diffs)

uspace/srv/bd/vbd/disk.c

@@ -39 +39 @@
 #include <errno.h>
 #include <io/log.h>
+#include <label/empty.h>
+#include <label/label.h>
 #include <loc.h>
 #include <stdio.h>
@@ -75 +77 @@
 static vbd_part_id_t vbds_part_id = 1;
 
+static int vbds_label_get_bsize(void *, size_t *);
+static int vbds_label_get_nblocks(void *, aoff64_t *);
+static int vbds_label_read(void *, aoff64_t, size_t, void *);
+static int vbds_label_write(void *, aoff64_t, size_t, const void *);
+
+/** Block device operations provided by VBD */
 static bd_ops_t vbds_bd_ops = {
         .open = vbds_bd_open,
@@ -83 +91 @@
         .get_block_size = vbds_bd_get_block_size,
         .get_num_blocks = vbds_bd_get_num_blocks
+};
+
+/** Provide disk access to liblabel */
+static label_bd_ops_t vbds_label_bd_ops = {
+        .get_bsize = vbds_label_get_bsize,
+        .get_nblocks = vbds_label_get_nblocks,
+        .read = vbds_label_read,
+        .write = vbds_label_write
 };
 
@@ -450 +466 @@
 {
         label_t *label = NULL;
+        label_bd_t lbd;
         vbds_disk_t *disk = NULL;
         bool block_inited = false;
@@ -467 +484 @@
                 return ENOMEM;
 
+        /* Must be set before calling label_open */
+        disk->svc_id = sid;
+
         rc = loc_service_get_name(sid, &disk->svc_name);
         if (rc != EOK) {
@@ -501 +521 @@
         block_inited = true;
 
-        rc = label_open(sid, &label);
+        lbd.ops = &vbds_label_bd_ops;
+        lbd.arg = (void *) disk;
+
+        rc = label_open(&lbd, &label);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to open label in disk %s.",
@@ -509 +532 @@
         }
 
-        disk->svc_id = sid;
         disk->label = label;
         disk->block_size = block_size;
@@ -648 +670 @@
 {
         label_t *label;
+        label_bd_t lbd;
         label_info_t linfo;
         vbds_disk_t *disk;
@@ -683 +706 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_label_create(%zu) - label_create", sid);
 
-        rc = label_create(sid, ltype, &label);
+        lbd.ops = &vbds_label_bd_ops;
+        lbd.arg = (void *) disk;
+
+        rc = label_create(&lbd, ltype, &label);
         if (rc != EOK)
                 goto error;
@@ -695 +721 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_label_create(%zu) - failure", sid);
         if (disk->label == NULL) {
-                rc2 = label_open(sid, &label);
+                lbd.ops = &vbds_label_bd_ops;
+                lbd.arg = (void *) disk;
+
+                rc2 = label_open(&lbd, &label);
                 if (rc2 != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to open label in disk %s.",
@@ -713 +742 @@
         vbds_disk_t *disk;
         label_t *label;
+        label_bd_t lbd;
         int rc;
 
@@ -735 +765 @@
         disk->label = NULL;
 
-        rc = label_open(disk->svc_id, &label);
+        lbd.ops = &vbds_label_bd_ops;
+        lbd.arg = (void *) disk;
+
+        rc = label_open(&lbd, &label);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to open label in disk %s.",
@@ -811 +844 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Error creating partition.");
+                goto error;
+        }
+
+        rc = label_part_empty(lpart);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Error emptying partition.");
                 goto error;
         }
@@ -1179 +1218 @@
 }
 
+/** Get block size wrapper for liblabel */
+static int vbds_label_get_bsize(void *arg, size_t *bsize)
+{
+        vbds_disk_t *disk = (vbds_disk_t *)arg;
+        return block_get_bsize(disk->svc_id, bsize);
+}
+
+/** Get number of blocks wrapper for liblabel */
+static int vbds_label_get_nblocks(void *arg, aoff64_t *nblocks)
+{
+        vbds_disk_t *disk = (vbds_disk_t *)arg;
+        return block_get_nblocks(disk->svc_id, nblocks);
+}
+
+/** Read blocks wrapper for liblabel */
+static int vbds_label_read(void *arg, aoff64_t ba, size_t cnt, void *buf)
+{
+        vbds_disk_t *disk = (vbds_disk_t *)arg;
+        return block_read_direct(disk->svc_id, ba, cnt, buf);
+}
+
+/** Write blocks wrapper for liblabel */
+static int vbds_label_write(void *arg, aoff64_t ba, size_t cnt, const void *data)
+{
+        vbds_disk_t *disk = (vbds_disk_t *)arg;
+        return block_write_direct(disk->svc_id, ba, cnt, data);
+}
+
 /** @}
  */