Changeset 372df8f in mainline for uspace/lib/c/generic/vol.c

Timestamp:

2015-10-09T07:00:23Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0ecfc62

Parents:

0bde8523

Message:

Let VBD handle unlabeled devices too. Now volsrv only cares about partitions.

File:

• uspace/lib/c/generic/vol.c (modified) (6 diffs)

uspace/lib/c/generic/vol.c

@@ -175 +175 @@
 }
 
-/** Get list of disks as array of service IDs.
+/** Get list of partitions as array of service IDs.
  *
  * @param vol Volume service
@@ -183 +183 @@
  * @return EOK on success or negative error code
  */
-int vol_get_disks(vol_t *vol, service_id_t **data, size_t *count)
-{
-        return vol_get_ids_internal(vol, VOL_GET_DISKS, 0, data, count);
-}
-
-/** Get disk information. */
-int vol_disk_info(vol_t *vol, service_id_t sid, vol_disk_info_t *vinfo)
+int vol_get_parts(vol_t *vol, service_id_t **data, size_t *count)
+{
+        return vol_get_ids_internal(vol, VOL_GET_PARTS, 0, data, count);
+}
+
+/** Get partition information. */
+int vol_part_info(vol_t *vol, service_id_t sid, vol_part_info_t *vinfo)
 {
         async_exch_t *exch;
@@ -196 +196 @@
 
         exch = async_exchange_begin(vol->sess);
-        retval = async_req_1_3(exch, VOL_DISK_INFO, sid, &dcnt, &ltype,
+        retval = async_req_1_3(exch, VOL_PART_INFO, sid, &dcnt, &ltype,
             &flags);
         async_exchange_end(exch);
@@ -209 +209 @@
 }
 
-/** Create new label. */
-int vol_label_create(vol_t *vol, service_id_t sid, label_type_t ltype)
+/** Erase partition (to the extent where we will consider it not containing
+ * a file system. */
+int vol_part_empty(vol_t *vol, service_id_t sid)
 {
         async_exch_t *exch;
@@ -216 +217 @@
 
         exch = async_exchange_begin(vol->sess);
-        retval = async_req_2_0(exch, VOL_LABEL_CREATE, sid, ltype);
+        retval = async_req_1_0(exch, VOL_PART_EMPTY, sid);
         async_exchange_end(exch);
 
@@ -225 +226 @@
 }
 
-/** Erase disk (to the extent where we will consider it not containing
- * a label or file system. */
-int vol_disk_empty(vol_t *vol, service_id_t sid)
-{
-        async_exch_t *exch;
-        int retval;
-
-        exch = async_exchange_begin(vol->sess);
-        retval = async_req_1_0(exch, VOL_DISK_EMPTY, sid);
-        async_exchange_end(exch);
-
-        if (retval != EOK)
-                return EIO;
-
-        return EOK;
-}
-
 /** @}
  */