Changeset 4b6635a7 in mainline for uspace/srv

Timestamp:

2015-10-12T15:42:23Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

edebb4a1

Parents:

6a0db524

Message:

Volsrv empty partition detection.

Location:

uspace/srv

Files:

• bd/vbd/disk.c (modified) (1 diff)
• volsrv/Makefile (modified) (1 diff)
• volsrv/empty.c (added)
• volsrv/empty.h (added)
• volsrv/part.c (modified) (3 diffs)
• volsrv/part.h (modified) (1 diff)

uspace/srv/bd/vbd/disk.c

@@ -647 +647 @@
         pinfo->block0 = lpinfo.block0;
         pinfo->nblocks = lpinfo.nblocks;
+        pinfo->svc_id = part->svc_id;
         return EOK;
 }

uspace/srv/volsrv/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
+
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a
+EXTRA_CFLAGS = -I $(LIBBLOCK_PREFIX)
+
 BINARY = volsrv
 
 SOURCES = \
+        empty.c \
         part.c \
         volsrv.c

uspace/srv/volsrv/part.c

@@ -43 +43 @@
 #include <str.h>
 
+#include "empty.h"
 #include "part.h"
 #include "types/part.h"
@@ -130 +131 @@
 {
         vol_part_t *part;
+        bool empty;
         int rc;
 
@@ -148 +150 @@
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "Probe partition %s", part->svc_name);
-
-        part->pcnt = vpc_unknown;
+        rc = vol_part_is_empty(sid, &empty);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed determining if "
+                    "partition is empty.");
+                goto error;
+        }
+
+        part->pcnt = empty ? vpc_empty : vpc_unknown;
         list_append(&part->lparts, &vol_parts);
 

uspace/srv/volsrv/part.h

@@ -36 +36 @@
 
 #ifndef PART_H_
-#define pART_H_
+#define PART_H_
 
+#include <loc.h>
 #include <sys/types.h>
 #include <vol.h>