Changeset 44fe800 in mainline for uspace/srv/volsrv

Timestamp:

2015-10-17T21:50:38Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

68b5dd11

Parents:

ea0ff6b

Message:

Create file system when creating partition.

Location:

uspace/srv/volsrv

Files:

• Makefile (modified) (1 diff)
• empty.c (modified) (2 diffs)
• empty.h (modified) (1 diff)
• mkfs.c (added)
• mkfs.h (added)
• part.c (modified) (4 diffs)
• part.h (modified) (1 diff)
• volsrv.c (modified) (2 diffs)

uspace/srv/volsrv/Makefile

@@ -36 +36 @@
 SOURCES = \
         empty.c \
+        mkfs.c \
         part.c \
         volsrv.c

uspace/srv/volsrv/empty.c

@@ -85 +85 @@
 }
 
-int vol_part_is_empty(service_id_t sid, bool *rempty)
+int volsrv_part_is_empty(service_id_t sid, bool *rempty)
 {
         int rc;
@@ -176 +176 @@
 }
 
-int vol_part_empty(service_id_t sid)
+int volsrv_part_empty(service_id_t sid)
 {
         int rc;

uspace/srv/volsrv/empty.h

@@ -40 +40 @@
 #include <loc.h>
 
-extern int vol_part_is_empty(service_id_t, bool *);
-extern int vol_part_empty(service_id_t);
+extern int volsrv_part_is_empty(service_id_t, bool *);
+extern int volsrv_part_empty(service_id_t);
 
 #endif

uspace/srv/volsrv/part.c

@@ -44 +44 @@
 
 #include "empty.h"
+#include "mkfs.h"
 #include "part.h"
 #include "types/part.h"
@@ -154 +155 @@
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "Probe partition %s", part->svc_name);
-        rc = vol_part_is_empty(sid, &empty);
+        rc = volsrv_part_is_empty(sid, &empty);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed determining if "
@@ -256 +257 @@
         log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_empty_part()");
 
-        rc = vol_part_empty(part->svc_id);
+        rc = volsrv_part_empty(part->svc_id);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_empty_part() - failed %d",
@@ -268 +269 @@
 }
 
+int vol_part_mkfs_part(vol_part_t *part, vol_fstype_t fstype)
+{
+        int rc;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_part()");
+
+        rc = volsrv_part_mkfs(part->svc_id, fstype);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_part() - failed %d",
+                    rc);
+                return rc;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_part() - success");
+        part->pcnt = vpc_fs;
+        part->fstype = fstype;
+        return EOK;
+}
+
 int vol_part_get_info(vol_part_t *part, vol_part_info_t *pinfo)
 {

uspace/srv/volsrv/part.h

@@ -49 +49 @@
 extern int vol_part_find_by_id(service_id_t, vol_part_t **);
 extern int vol_part_empty_part(vol_part_t *);
+extern int vol_part_mkfs_part(vol_part_t *, vol_fstype_t);
 extern int vol_part_get_info(vol_part_t *, vol_part_info_t *);
 

uspace/srv/volsrv/volsrv.c

@@ -220 +220 @@
 }
 
+static void vol_part_mkfs_srv(ipc_callid_t iid, ipc_call_t *icall)
+{
+        service_id_t sid;
+        vol_part_t *part;
+        vol_fstype_t fstype;
+        int rc;
+
+        sid = IPC_GET_ARG1(*icall);
+        fstype = IPC_GET_ARG2(*icall);
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_srv(%zu, %d)", sid,
+            fstype);
+
+        rc = vol_part_find_by_id(sid, &part);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_srv(%zu) - "
+                    "partition not found", sid);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_mkfs_srv(%zu) - "
+            "call vol_part_mkfs_part()", sid);
+        rc = vol_part_mkfs_part(part, fstype);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        async_answer_0(iid, EOK);
+}
+
 static void vol_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -251 +283 @@
                         vol_part_empty_srv(callid, &call);
                         break;
+                case VOL_PART_MKFS:
+                        vol_part_mkfs_srv(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, EINVAL);