Changeset e28175d in mainline for uspace/srv/fs/udf

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

Location:

uspace/srv/fs/udf

Files:

• meson.build (added)
• udf.c (modified) (1 diff)
• udf_ops.c (modified) (1 diff)

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)

uspace/srv/fs/udf/udf_ops.c

@@ -328 +328 @@
         /* initialize block cache */
         errno_t rc = block_init(service_id, MAX_SIZE);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                free(instance);
+                return rc;
+        }
 
         rc = fs_instance_create(service_id, instance);