Changeset 132ab5d1 in mainline for uspace/srv/volsrv/part.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/volsrv/part.c (modified) (4 diffs)

uspace/srv/volsrv/part.c

@@ -37 +37 @@
 #include <stdbool.h>
 #include <errno.h>
+#include <str_error.h>
 #include <fibril_synch.h>
 #include <io/log.h>
@@ -271 +272 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback "
-                    "for partition discovery (%d).", rc);
+                    "for partition discovery: %s.", str_error(rc));
                 return rc;
         }
@@ -328 +329 @@
         rc = volsrv_part_empty(part->svc_id);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_part() - failed %d",
-                    rc);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_part() - failed %s",
+                    str_error(rc));
                 return rc;
         }
@@ -348 +349 @@
         rc = volsrv_part_mkfs(part->svc_id, fstype, label);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_mkfs_part() - failed %d",
-                    rc);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_mkfs_part() - failed %s",
+                    str_error(rc));
                 fibril_mutex_unlock(&vol_parts_lock);
                 return rc;