Changeset 01900b6 in mainline for uspace/srv

Timestamp:

2020-01-21T15:10:26Z (5 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

51da086

Parents:

f8fb03b

Message:

Use an optional output argument instead of errno to propagate the error

The use of errno is troublesome in all other than top-level library
functions since the value in errno might get overwritten by subsequent
inner calls on the error path (e.g. cleanup, deallocation, etc.). The
optional output argument makes it possible to explicitly ignore the
error code if it is not needed, but still to pass it reliably back to
the original caller.

This change affecs async_connect_me_to(),
async_connect_me_to_blocking(), async_connect_kbox(), service_connect(),
service_connect_blocking() and loader_connect().

Location:

uspace/srv/fs

Files:

• cdfs/cdfs.c (modified) (1 diff)
• exfat/exfat.c (modified) (1 diff)
• ext4fs/ext4fs.c (modified) (3 diffs)
• fat/fat.c (modified) (1 diff)
• locfs/locfs.c (modified) (1 diff)
• mfs/mfs.c (modified) (1 diff)
• tmpfs/tmpfs.c (modified) (1 diff)
• udf/udf.c (modified) (1 diff)

uspace/srv/fs/cdfs/cdfs.c

@@ -75 +75 @@
         }
 
+        errno_t rc;
         async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
-            INTERFACE_VFS_DRIVER, 0);
+            INTERFACE_VFS_DRIVER, 0, &rc);
         if (!vfs_sess) {
-                printf("%s: Unable to connect to VFS\n", NAME);
+                printf("%s: Unable to connect to VFS: %s\n", NAME, str_error(rc));
                 return -1;
         }
 
-        errno_t rc = fs_register(vfs_sess, &cdfs_vfs_info, &cdfs_ops,
+        rc = fs_register(vfs_sess, &cdfs_vfs_info, &cdfs_ops,
             &cdfs_libfs_ops);
         if (rc != EOK) {

uspace/srv/fs/exfat/exfat.c

@@ -77 +77 @@
 
         async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
-            INTERFACE_VFS_DRIVER, 0);
+            INTERFACE_VFS_DRIVER, 0, &rc);
         if (!vfs_sess) {
-                printf(NAME ": failed to connect to VFS\n");
+                printf(NAME ": failed to connect to VFS: %s\n", str_error(rc));
                 return -1;
         }

uspace/srv/fs/ext4fs/ext4fs.c

@@ -43 +43 @@
 #include <ipc/services.h>
 #include <str.h>
+#include <str_error.h>
 #include "ext4/ops.h"
 #include "../../vfs/vfs.h"
@@ -66 +67 @@
         }
 
+        errno_t rc;
         async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
-            INTERFACE_VFS_DRIVER, 0);
+            INTERFACE_VFS_DRIVER, 0, &rc);
         if (!vfs_sess) {
-                printf("%s: Failed to connect to VFS\n", NAME);
+                printf("%s: Failed to connect to VFS: %s\n", NAME, str_error(rc));
                 return 2;
         }
 
-        errno_t rc = ext4_global_init();
+        rc = ext4_global_init();
         if (rc != EOK) {
-                printf("%s: Global initialization failed\n", NAME);
+                printf("%s: Global initialization failed: %s\n", NAME,
+                    str_error(rc));
                 return rc;
         }
@@ -82 +85 @@
             &ext4_libfs_ops);
         if (rc != EOK) {
-                printf("%s: Failed to register file system\n", NAME);
+                printf("%s: Failed to register file system: %s\n", NAME,
+                    str_error(rc));
                 return rc;
         }

uspace/srv/fs/fat/fat.c

@@ -77 +77 @@
 
         async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
-            INTERFACE_VFS_DRIVER, 0);
+            INTERFACE_VFS_DRIVER, 0, &rc);
         if (!vfs_sess) {
-                printf(NAME ": failed to connect to VFS\n");
+                printf(NAME ": failed to connect to VFS: %s\n", str_error(rc));
                 return -1;
         }

uspace/srv/fs/locfs/locfs.c

@@ -78 +78 @@
         }
 
+        errno_t rc;
         async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
-            INTERFACE_VFS_DRIVER, 0);
+            INTERFACE_VFS_DRIVER, 0, &rc);
         if (!vfs_sess) {
-                printf("%s: Unable to connect to VFS\n", NAME);
+                printf("%s: Unable to connect to VFS: %s\n", NAME, str_error(rc));
                 return -1;
         }
 
-        errno_t rc = fs_register(vfs_sess, &locfs_vfs_info, &locfs_ops,
+        rc = fs_register(vfs_sess, &locfs_vfs_info, &locfs_ops,
             &locfs_libfs_ops);
         if (rc != EOK) {

uspace/srv/fs/mfs/mfs.c

@@ -74 +74 @@
 
         async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
-            INTERFACE_VFS_DRIVER, 0);
-
+            INTERFACE_VFS_DRIVER, 0, &rc);
         if (!vfs_sess) {
-                printf(NAME ": failed to connect to VFS\n");
+                printf(NAME ": failed to connect to VFS: %s\n", str_error(rc));
                 rc = errno;
                 goto err;

uspace/srv/fs/tmpfs/tmpfs.c

@@ -80 +80 @@
         }
 
+        errno_t rc;
         async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
-            INTERFACE_VFS_DRIVER, 0);
+            INTERFACE_VFS_DRIVER, 0, &rc);
         if (!vfs_sess) {
-                printf("%s: Unable to connect to VFS\n", NAME);
+                printf("%s: Unable to connect to VFS: %s\n", NAME, str_error(rc));
                 return -1;
         }
 
-        errno_t rc = fs_register(vfs_sess, &tmpfs_vfs_info, &tmpfs_ops,
+        rc = fs_register(vfs_sess, &tmpfs_vfs_info, &tmpfs_ops,
             &tmpfs_libfs_ops);
         if (rc != EOK) {

uspace/srv/fs/udf/udf.c

@@ -73 +73 @@
         }
 
+        errno_t rc;
         async_sess_t *vfs_sess =
-            service_connect_blocking(SERVICE_VFS, INTERFACE_VFS_DRIVER, 0);
+            service_connect_blocking(SERVICE_VFS, INTERFACE_VFS_DRIVER, 0, &rc);
         if (!vfs_sess) {
-                log_msg(LOG_DEFAULT, LVL_FATAL, "Failed to connect to VFS");
+                log_msg(LOG_DEFAULT, LVL_FATAL, "Failed to connect to VFS: %s",
+                    str_error(rc));
                 return 2;
         }
 
-        errno_t rc = fs_register(vfs_sess, &udf_vfs_info, &udf_ops,
+        rc = fs_register(vfs_sess, &udf_vfs_info, &udf_ops,
             &udf_libfs_ops);
         if (rc != EOK)