Changeset e28175d in mainline for uspace/srv/fs


Ignore:
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
Files:
6 added
6 deleted
9 edited
2 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/fs/cdfs/cdfs.c

    rb401b33 re28175d  
    7575        }
    7676
     77        errno_t rc;
    7778        async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
    78             INTERFACE_VFS_DRIVER, 0);
     79            INTERFACE_VFS_DRIVER, 0, &rc);
    7980        if (!vfs_sess) {
    80                 printf("%s: Unable to connect to VFS\n", NAME);
     81                printf("%s: Unable to connect to VFS: %s\n", NAME, str_error(rc));
    8182                return -1;
    8283        }
    8384
    84         errno_t rc = fs_register(vfs_sess, &cdfs_vfs_info, &cdfs_ops,
     85        rc = fs_register(vfs_sess, &cdfs_vfs_info, &cdfs_ops,
    8586            &cdfs_libfs_ops);
    8687        if (rc != EOK) {

  • uspace/srv/fs/exfat/exfat.c

    rb401b33 re28175d  
    7777
    7878        async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
    79             INTERFACE_VFS_DRIVER, 0);
     79            INTERFACE_VFS_DRIVER, 0, &rc);
    8080        if (!vfs_sess) {
    81                 printf(NAME ": failed to connect to VFS\n");
     81                printf(NAME ": failed to connect to VFS: %s\n", str_error(rc));
    8282                return -1;
    8383        }

  • uspace/srv/fs/ext4fs/ext4fs.c

    rb401b33 re28175d  
    4343#include <ipc/services.h>
    4444#include <str.h>
     45#include <str_error.h>
    4546#include "ext4/ops.h"
    4647#include "../../vfs/vfs.h"
    … …  
    6667        }
    6768
     69        errno_t rc;
    6870        async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
    69             INTERFACE_VFS_DRIVER, 0);
     71            INTERFACE_VFS_DRIVER, 0, &rc);
    7072        if (!vfs_sess) {
    71                 printf("%s: Failed to connect to VFS\n", NAME);
     73                printf("%s: Failed to connect to VFS: %s\n", NAME, str_error(rc));
    7274                return 2;
    7375        }
    7476
    75         errno_t rc = ext4_global_init();
     77        rc = ext4_global_init();
    7678        if (rc != EOK) {
    77                 printf("%s: Global initialization failed\n", NAME);
     79                printf("%s: Global initialization failed: %s\n", NAME,
     80                    str_error(rc));
    7881                return rc;
    7982        }
    … …  
    8285            &ext4_libfs_ops);
    8386        if (rc != EOK) {
    84                 printf("%s: Failed to register file system\n", NAME);
     87                printf("%s: Failed to register file system: %s\n", NAME,
     88                    str_error(rc));
    8589                return rc;
    8690        }

  • uspace/srv/fs/fat/fat.c

    rb401b33 re28175d  
    7777
    7878        async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
    79             INTERFACE_VFS_DRIVER, 0);
     79            INTERFACE_VFS_DRIVER, 0, &rc);
    8080        if (!vfs_sess) {
    81                 printf(NAME ": failed to connect to VFS\n");
     81                printf(NAME ": failed to connect to VFS: %s\n", str_error(rc));
    8282                return -1;
    8383        }

  • uspace/srv/fs/fat/meson.build

    rb401b33 re28175d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 BINARY = edit
    32 
    33 SOURCES = \
    34         edit.c \
    35         sheet.c \
    36         search.c
    37 
    38 include $(USPACE_PREFIX)/Makefile.common
     30deps = [ 'block', 'fs' ]
     31src = files(
     32        'fat.c',
     33        'fat_ops.c',
     34        'fat_idx.c',
     35        'fat_dentry.c',
     36        'fat_directory.c',
     37        'fat_fat.c',
     38)

  • uspace/srv/fs/locfs/locfs.c

    rb401b33 re28175d  
    7878        }
    7979
     80        errno_t rc;
    8081        async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
    81             INTERFACE_VFS_DRIVER, 0);
     82            INTERFACE_VFS_DRIVER, 0, &rc);
    8283        if (!vfs_sess) {
    83                 printf("%s: Unable to connect to VFS\n", NAME);
     84                printf("%s: Unable to connect to VFS: %s\n", NAME, str_error(rc));
    8485                return -1;
    8586        }
    8687
    87         errno_t rc = fs_register(vfs_sess, &locfs_vfs_info, &locfs_ops,
     88        rc = fs_register(vfs_sess, &locfs_vfs_info, &locfs_ops,
    8889            &locfs_libfs_ops);
    8990        if (rc != EOK) {

  • uspace/srv/fs/mfs/meson.build

    rb401b33 re28175d  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 BINARY = init
    32 STATIC_NEEDED = y
    33 
    34 LIBS = untar block
    35 
    36 SOURCES = \
    37         init.c \
    38         untar.c
    39 
    40 include $(USPACE_PREFIX)/Makefile.common
     30deps = [ 'block', 'fs', 'minix' ]
     31src = files(
     32        'mfs.c',
     33        'mfs_ops.c',
     34        'mfs_inode.c',
     35        'mfs_rw.c',
     36        'mfs_dentry.c',
     37        'mfs_balloc.c',
     38        'mfs_utils.c',
     39)

  • uspace/srv/fs/mfs/mfs.c

    rb401b33 re28175d  
    7474
    7575        async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
    76             INTERFACE_VFS_DRIVER, 0);
    77 
     76            INTERFACE_VFS_DRIVER, 0, &rc);
    7877        if (!vfs_sess) {
    79                 printf(NAME ": failed to connect to VFS\n");
     78                printf(NAME ": failed to connect to VFS: %s\n", str_error(rc));
    8079                rc = errno;
    8180                goto err;

  • uspace/srv/fs/tmpfs/tmpfs.c

    rb401b33 re28175d  
    8080        }
    8181
     82        errno_t rc;
    8283        async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS,
    83             INTERFACE_VFS_DRIVER, 0);
     84            INTERFACE_VFS_DRIVER, 0, &rc);
    8485        if (!vfs_sess) {
    85                 printf("%s: Unable to connect to VFS\n", NAME);
     86                printf("%s: Unable to connect to VFS: %s\n", NAME, str_error(rc));
    8687                return -1;
    8788        }
    8889
    89         errno_t rc = fs_register(vfs_sess, &tmpfs_vfs_info, &tmpfs_ops,
     90        rc = fs_register(vfs_sess, &tmpfs_vfs_info, &tmpfs_ops,
    9091            &tmpfs_libfs_ops);
    9192        if (rc != EOK) {

  • uspace/srv/fs/udf/udf.c

    rb401b33 re28175d  
    7373        }
    7474
     75        errno_t rc;
    7576        async_sess_t *vfs_sess =
    76             service_connect_blocking(SERVICE_VFS, INTERFACE_VFS_DRIVER, 0);
     77            service_connect_blocking(SERVICE_VFS, INTERFACE_VFS_DRIVER, 0, &rc);
    7778        if (!vfs_sess) {
    78                 log_msg(LOG_DEFAULT, LVL_FATAL, "Failed to connect to VFS");
     79                log_msg(LOG_DEFAULT, LVL_FATAL, "Failed to connect to VFS: %s",
     80                    str_error(rc));
    7981                return 2;
    8082        }
    8183
    82         errno_t rc = fs_register(vfs_sess, &udf_vfs_info, &udf_ops,
     84        rc = fs_register(vfs_sess, &udf_vfs_info, &udf_ops,
    8385            &udf_libfs_ops);
    8486        if (rc != EOK)

  • uspace/srv/fs/udf/udf_ops.c

    rb401b33 re28175d  
    328328        /* initialize block cache */
    329329        errno_t rc = block_init(service_id, MAX_SIZE);
    330         if (rc != EOK)
    331                 return rc;
     330        if (rc != EOK) {
     331                free(instance);
     332                return rc;
     333        }
    332334
    333335        rc = fs_instance_create(service_id, instance);
Note: See TracChangeset for help on using the changeset viewer.