Changeset 603c1d1f in mainline for uspace/srv/volsrv

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/volsrv

Files:

• disk.c (modified) (1 diff)
• disk.h (modified) (1 diff)
• volsrv.c (modified) (2 diffs)

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);