Changeset edebb4a1 in mainline for uspace/srv/volsrv

Timestamp:

2015-10-14T22:30:12Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ea0ff6b

Parents:

4b6635a7

Message:

Handle dummy partition addition/removal during label destruction/creation. Handle dummy label properly in fdisk.

Location:

uspace/srv/volsrv

Files:

• part.c (modified) (5 diffs)
• part.h (modified) (1 diff)
• volsrv.c (modified) (8 diffs)

uspace/srv/volsrv/part.c

@@ -47 +47 @@
 #include "types/part.h"
 
-static int vol_part_add(service_id_t);
-
+static int vol_part_add_locked(service_id_t);
 static LIST_INITIALIZE(vol_parts); /* of vol_part_t */
 static FIBRIL_MUTEX_INITIALIZE(vol_parts_lock);
@@ -91 +90 @@
                         log_msg(LOG_DEFAULT, LVL_NOTE, "Found partition '%lu'",
                             (unsigned long) svcs[i]);
-                        rc = vol_part_add(svcs[i]);
+                        rc = vol_part_add_locked(svcs[i]);
                         if (rc != EOK) {
                                 log_msg(LOG_DEFAULT, LVL_ERROR, "Could not add "
@@ -128 +127 @@
 }
 
-static int vol_part_add(service_id_t sid)
+static int vol_part_add_locked(service_id_t sid)
 {
         vol_part_t *part;
@@ -135 +134 @@
 
         assert(fibril_mutex_is_locked(&vol_parts_lock));
+
+        /* Check for duplicates */
+        rc = vol_part_find_by_id(sid, &part);
+        if (rc == EOK)
+                return EEXIST;
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_add()");
@@ -160 +164 @@
         list_append(&part->lparts, &vol_parts);
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Added partition %zu", part->svc_id);
+
         return EOK;
 
 error:
         vol_part_delete(part);
+        return rc;
+}
+
+int vol_part_add(service_id_t sid)
+{
+        int rc;
+
+        fibril_mutex_lock(&vol_parts_lock);
+        rc = vol_part_add_locked(sid);
+        fibril_mutex_unlock(&vol_parts_lock);
+
         return rc;
 }

uspace/srv/volsrv/part.h

@@ -40 +40 @@
 #include <loc.h>
 #include <sys/types.h>
-#include <vol.h>
+#include <types/vol.h>
 #include "types/part.h"
 
 extern int vol_part_init(void);
 extern int vol_part_discovery_start(void);
+extern int vol_part_add(service_id_t);
 extern int vol_part_get_ids(service_id_t *, size_t, size_t *);
 extern int vol_part_find_by_id(service_id_t, vol_part_t **);

uspace/srv/volsrv/volsrv.c

@@ -44 +44 @@
 #include <stdlib.h>
 #include <task.h>
-#include <vol.h>
+#include <types/vol.h>
 
 #include "part.h"
@@ -116 +116 @@
 }
 
+static void vol_part_add_srv(ipc_callid_t iid, ipc_call_t *icall)
+{
+        service_id_t sid;
+        int rc;
+
+        sid = IPC_GET_ARG1(*icall);
+
+        rc = vol_part_add(sid);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        async_answer_0(iid, EOK);
+}
+
+
 static void vol_part_info_srv(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -124 +141 @@
 
         sid = IPC_GET_ARG1(*icall);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu)",
+            sid);
         rc = vol_part_find_by_id(sid, &part);
         if (rc != EOK) {
                 async_answer_0(iid, ENOENT);
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - "
+                    "not found", sid);
                 return;
         }
@@ -133 +154 @@
         if (rc != EOK) {
                 async_answer_0(iid, EIO);
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - "
+                    "get info failed (%d)", sid, rc);
                 return;
         }
@@ -141 +164 @@
                 async_answer_0(callid, EREFUSED);
                 async_answer_0(iid, EREFUSED);
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - "
+                    "read receive failed", sid);
                 return;
         }
@@ -147 +172 @@
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - "
+                    "incorrect size", sid);
                 return;
         }
@@ -155 +182 @@
                 async_answer_0(callid, rc);
                 async_answer_0(iid, rc);
-                return;
-        }
-
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - "
+                    "data read failed", sid);
+                return;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_info_srv(%zu) - "
+            "success", sid);
         async_answer_0(iid, EOK);
 }
@@ -206 +237 @@
                         vol_get_parts_srv(callid, &call);
                         break;
+                case VOL_PART_ADD:
+                        vol_part_add_srv(callid, &call);
+                        break;
                 case VOL_PART_INFO:
                         vol_part_info_srv(callid, &call);