Changeset 53e3950 in mainline for uspace/srv/bd/vbd/disk.c

Timestamp:

2016-02-18T17:01:49Z (8 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.

File:

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

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