Changeset 603c1d1f in mainline for uspace/srv

Timestamp:

2015-07-05T18:53:00Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bf7ddde

Parents:

99c23405

Message:

Persistent partition table creation and destruction.

Location:

uspace/srv

Files:

• bd/part/guid_part/guid_part.c (modified) (1 diff)
• bd/vbd/disk.c (modified) (7 diffs)
• volsrv/disk.c (modified) (1 diff)
• volsrv/disk.h (modified) (1 diff)
• volsrv/volsrv.c (modified) (2 diffs)

uspace/srv/bd/part/guid_part/guid_part.c

@@ -250 +250 @@
         }
 
-        rc = block_read_direct(indev_sid, GPT_HDR_BA, 1, gpt_hdr);
+        rc = block_read_direct(indev_sid, gpt_hdr_ba, 1, gpt_hdr);
         if (rc != EOK) {
                 printf(NAME ": Failed reading GPT header block.\n");

uspace/srv/bd/vbd/disk.c

@@ -223 +223 @@
         }
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "block_init(%zu)", sid);
         rc = block_init(EXCHANGE_SERIALIZE, sid, 2048);
         if (rc != EOK) {
@@ -272 +273 @@
 error:
         label_close(label);
-        if (block_inited)
+        if (block_inited) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "block_fini(%zu)", sid);
                 block_fini(sid);
+        }
         if (disk != NULL)
                 free(disk->svc_name);
@@ -293 +296 @@
         list_remove(&disk->ldisks);
         label_close(disk->label);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "block_fini(%zu)", sid);
+        block_fini(sid);
         free(disk);
         return EOK;
@@ -353 +358 @@
         label_t *label;
         vbds_disk_t *disk;
+        bool block_inited = false;
+        size_t block_size;
         int rc;
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_label_create(%zu)", sid);
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_label_create(%zu) - chkdup", sid);
 
         /* Check for duplicates */
@@ -362 +371 @@
                 return EEXISTS;
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_label_create(%zu) - alloc", sid);
+
         disk = calloc(1, sizeof(vbds_disk_t));
         if (disk == NULL)
                 return ENOMEM;
 
+        rc = loc_service_get_name(sid, &disk->svc_name);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting disk service name.");
+                rc = EIO;
+                goto error;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "block_init(%zu)", sid);
+        rc = block_init(EXCHANGE_SERIALIZE, sid, 2048);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed opening block device %s.",
+                    disk->svc_name);
+                rc = EIO;
+                goto error;
+        }
+
+        rc = block_get_bsize(sid, &block_size);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting block size of %s.",
+                    disk->svc_name);
+                rc = EIO;
+                goto error;
+        }
+
+        block_inited = true;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_label_create(%zu) - label_create", sid);
+
         rc = label_create(sid, ltype, &label);
         if (rc != EOK)
@@ -372 +411 @@
         disk->svc_id = sid;
         disk->label = label;
+        disk->block_size = block_size;
+        list_initialize(&disk->parts);
+
         list_append(&disk->ldisks, &vbds_disks);
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_label_create(%zu) - success", sid);
         return EOK;
 error:
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_label_create(%zu) - failure", sid);
+        if (block_inited) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "block_fini(%zu)", sid);
+                block_fini(sid);
+        }
+        if (disk != NULL)
+                free(disk->svc_name);
         free(disk);
         return rc;
@@ -397 +448 @@
 
         list_remove(&disk->ldisks);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "block_fini(%zu)", sid);
+        block_fini(sid);
         free(disk);
         return EOK;

uspace/srv/volsrv/disk.c

@@ -257 +257 @@
 }
 
+int vol_disk_label_create(vol_disk_t *disk, label_type_t ltype)
+{
+        int rc;
+
+        rc = vbd_label_create(vbd, disk->svc_id, ltype);
+        if (rc != EOK)
+                return rc;
+
+        disk->dcnt = dc_label;
+        disk->ltype = ltype;
+
+        return EOK;
+}
+
+int vol_disk_empty(vol_disk_t *disk)
+{
+        int rc;
+
+        if (disk->dcnt == dc_label) {
+                rc = vbd_label_delete(vbd, disk->svc_id);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        disk->dcnt = dc_empty;
+
+        return EOK;
+}
+
+
 /** @}
  */

uspace/srv/volsrv/disk.h

@@ -45 +45 @@
 extern int vol_disk_get_ids(service_id_t *, size_t, size_t *);
 extern int vol_disk_find_by_id(service_id_t, vol_disk_t **);
+extern int vol_disk_label_create(vol_disk_t *, label_type_t);
+extern int vol_disk_empty(vol_disk_t *);
 
 #endif

uspace/srv/volsrv/volsrv.c

@@ -146 +146 @@
         }
 
-        disk->dcnt = dc_label;
-        disk->ltype = ltype;
+        rc = vol_disk_label_create(disk, ltype);
+        if (rc != EOK) {
+                async_answer_0(iid, EIO);
+                return;
+        }
 
         async_answer_0(iid, EOK);
@@ -166 +169 @@
         }
 
-        disk->dcnt = dc_empty;
+        rc = vol_disk_empty(disk);
+        if (rc != EOK) {
+                async_answer_0(iid, EIO);
+                return;
+        }
 
         async_answer_0(iid, EOK);