Changeset 53e3950 in mainline

Timestamp:

2016-02-18T17:01:49Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9e53406

Parents:

e11c527

Message:

libfdisk should not depend on libblock nor should it access the block devices directly.

Location:

uspace

Files:

• app/fdisk/Makefile (modified) (1 diff)
• lib/c/include/vbd.h (modified) (1 diff)
• lib/fdisk/Makefile (modified) (1 diff)
• lib/fdisk/include/types/fdisk.h (modified) (2 diffs)
• lib/fdisk/src/fdisk.c (modified) (7 diffs)
• srv/bd/vbd/disk.c (modified) (4 diffs)
• srv/bd/vbd/types/vbd.h (modified) (1 diff)

uspace/app/fdisk/Makefile

@@ -30 +30 @@
 LIBS = \
         $(LIBCLUI_PREFIX)/libclui.a \
-        $(LIBFDISK_PREFIX)/libfdisk.a \
-        $(LIBBLOCK_PREFIX)/libblock.a
+        $(LIBFDISK_PREFIX)/libfdisk.a
 
 EXTRA_CFLAGS = \

uspace/lib/c/include/vbd.h

@@ -59 +59 @@
         /** Block size */
         size_t block_size;
+        /** Total number of blocks */
+        aoff64_t nblocks;
 } vbd_disk_info_t;
 

uspace/lib/fdisk/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-EXTRA_CFLAGS = -Iinclude -I$(LIBBLOCK_PREFIX)
+EXTRA_CFLAGS = -Iinclude
 
 LIBRARY = libfdisk

uspace/lib/fdisk/include/types/fdisk.h

@@ -110 +110 @@
 /** List of devices available for managing by fdisk */
 typedef struct {
+        /** Fdisk instance */
+        struct fdisk *fdisk;
+        /** List of device info structures */
         list_t devinfos; /* of fdisk_dev_info_t */
 } fdisk_dev_list_t;
@@ -123 +126 @@
         /** Service name or NULL if not determined yet */
         char *svcname;
-        /** Device is initialized in libblock */
-        bool blk_inited;
 } fdisk_dev_info_t;
 

uspace/lib/fdisk/src/fdisk.c

@@ -35 +35 @@
 
 #include <adt/list.h>
-#include <block.h>
 #include <errno.h>
 #include <fdisk.h>
 #include <loc.h>
+#include <macros.h>
 #include <mem.h>
 #include <stdlib.h>
@@ -65 +65 @@
                 return;
 
-        if (info->blk_inited)
-                block_fini(info->svcid);
-
         free(info->svcname);
         free(info);
@@ -125 +122 @@
                 return ENOMEM;
 
+        devlist->fdisk = fdisk;
         list_initialize(&devlist->devinfos);
 
@@ -222 +220 @@
 int fdisk_dev_info_capacity(fdisk_dev_info_t *info, fdisk_cap_t *cap)
 {
-        size_t bsize;
-        aoff64_t nblocks;
-        int rc;
-
-        if (!info->blk_inited) {
-                rc = block_init(info->svcid, 2048);
-                if (rc != EOK)
-                        return rc;
-
-                info->blk_inited = true;
-        }
-
-        rc = block_get_bsize(info->svcid, &bsize);
+        vbd_disk_info_t vinfo;
+        int rc;
+
+        rc = vbd_disk_info(info->devlist->fdisk->vbd, info->svcid, &vinfo);
         if (rc != EOK)
                 return EIO;
 
-        rc = block_get_nblocks(info->svcid, &nblocks);
-        if (rc != EOK)
-                return EIO;
-
-        fdisk_cap_from_blocks(nblocks, bsize, cap);
+        fdisk_cap_from_blocks(vinfo.nblocks, vinfo.block_size, cap);
         return EOK;
 }
@@ -435 +420 @@
 int fdisk_dev_open(fdisk_t *fdisk, service_id_t sid, fdisk_dev_t **rdev)
 {
-        vbd_disk_info_t vinfo;
         fdisk_dev_t *dev = NULL;
         service_id_t *psids = NULL;
@@ -451 +435 @@
         list_initialize(&dev->pri_ba);
         list_initialize(&dev->log_ba);
-
-        rc = vbd_disk_info(fdisk->vbd, sid, &vinfo);
-        if (rc != EOK) {
-                rc = EIO;
-                goto error;
-        }
 
         rc = fdisk_update_dev_info(dev);
@@ -554 +532 @@
 int fdisk_dev_capacity(fdisk_dev_t *dev, fdisk_cap_t *cap)
 {
-        size_t bsize;
-        aoff64_t nblocks;
-        int rc;
-
-        rc = block_init(dev->sid, 2048);
-        if (rc != EOK)
-                return rc;
-
-        rc = block_get_bsize(dev->sid, &bsize);
-        if (rc != EOK)
-                return EIO;
-
-        rc = block_get_nblocks(dev->sid, &nblocks);
-        if (rc != EOK)
-                return EIO;
-
-        block_fini(dev->sid);
-
-        fdisk_cap_from_blocks(nblocks, bsize, cap);
+        fdisk_cap_from_blocks(dev->dinfo.nblocks, dev->dinfo.block_size, cap);
         return EOK;
 }

uspace/srv/bd/vbd/disk.c

@@ -452 +452 @@
         bool block_inited = false;
         size_t block_size;
+        aoff64_t nblocks;
         int rc;
 
@@ -489 +490 @@
         }
 
+        rc = block_get_nblocks(sid, &nblocks);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting number of "
+                    "blocks of %s.", disk->svc_name);
+                rc = EIO;
+                goto error;
+        }
+
         block_inited = true;
 
@@ -502 +511 @@
         disk->label = label;
         disk->block_size = block_size;
+        disk->nblocks = nblocks;
         disk->present = true;
 
@@ -598 +608 @@
         info->anblocks = linfo.anblocks;
         info->block_size = disk->block_size;
+        info->nblocks = disk->nblocks;
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_disk_info - block_size=%zu",
             info->block_size);

uspace/srv/bd/vbd/types/vbd.h

@@ -100 +100 @@
         /** Block size */
         size_t block_size;
+        /** Total number of blocks */
+        aoff64_t nblocks;
         /** Used to mark disks still present during re-discovery */
         bool present;