Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 80743a1 in mainline


Ignore:
Timestamp:
2017-04-01T06:49:10Z (3 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
master
Children:
b19e892
Parents:
6e5562a
Message:

Rename (un)mount to vfs_(un)mount_path

Location:
uspace
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/bdsh/cmds/modules/mount/mount.c

    r6e5562a r80743a1  
    147147                mopts = t_argv[4];
    148148
    149         rc = mount(t_argv[1], t_argv[2], dev, mopts, 0, instance);
     149        rc = vfs_mount_path(t_argv[2], t_argv[1], dev, mopts, 0, instance);
    150150        if (rc != EOK) {
    151151                printf("Unable to mount %s filesystem to %s on %s (rc=%s)\n",
    152                     t_argv[1], t_argv[2], t_argv[3], str_error(rc));
     152                    t_argv[2], t_argv[1], t_argv[3], str_error(rc));
    153153                return CMD_FAILURE;
    154154        }
  • uspace/app/bdsh/cmds/modules/unmount/unmount.c

    r6e5562a r80743a1  
    6666        }
    6767
    68         rc = unmount(argv[1]);
     68        rc = vfs_unmount_path(argv[1]);
    6969        if (rc != EOK) {
    7070                printf("Unable to unmount %s (rc=%d)\n", argv[1], rc);
  • uspace/app/init/init.c

    r6e5562a r80743a1  
    127127                opts = "restore";
    128128       
    129         int rc = mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,
     129        int rc = vfs_mount_path(ROOT_MOUNT_POINT, fstype, ROOT_DEVICE, opts,
    130130            IPC_FLAG_BLOCKING, 0);
    131131        if (rc == EOK)
     
    146146static bool mount_locfs(void)
    147147{
    148         int rc = mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "",
     148        int rc = vfs_mount_path(LOCFS_MOUNT_POINT, LOCFS_FS_TYPE, "", "",
    149149            IPC_FLAG_BLOCKING, 0);
    150150        return mount_report("Location service filesystem", LOCFS_MOUNT_POINT,
     
    302302static bool mount_tmpfs(void)
    303303{
    304         int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0, 0);
     304        int rc = vfs_mount_path(TMPFS_MOUNT_POINT, TMPFS_FS_TYPE, "", "", 0, 0);
    305305        return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
    306306            TMPFS_FS_TYPE, NULL, rc);
  • uspace/app/sysinst/sysinst.c

    r6e5562a r80743a1  
    179179
    180180        printf("sysinst_fs_mount(): mount filesystem\n");
    181         rc = mount(FS_TYPE, MOUNT_POINT, dev, "", 0, 0);
     181        rc = vfs_mount_path(MOUNT_POINT, FS_TYPE, dev, "", 0, 0);
    182182        if (rc != EOK)
    183183                return rc;
     
    218218
    219219        printf("sysinst_copy_boot_files(): mount CD filesystem\n");
    220         rc = mount(CD_FS_TYPE, CD_MOUNT_POINT, CD_DEV, "", 0, 0);
     220        rc = vfs_mount_path(CD_MOUNT_POINT, CD_FS_TYPE, CD_DEV, "", 0, 0);
    221221        if (rc != EOK)
    222222                return rc;
     
    228228
    229229        printf("sysinst_copy_boot_files(): unmount %s\n", MOUNT_POINT);
    230         rc = unmount(MOUNT_POINT);
     230        rc = vfs_unmount_path(MOUNT_POINT);
    231231        if (rc != EOK)
    232232                return rc;
  • uspace/lib/c/generic/vfs/vfs.c

    r6e5562a r80743a1  
    255255}
    256256
    257 int mount(const char *fs_name, const char *mp, const char *fqsn,
     257int vfs_mount_path(const char *mp, const char *fs_name, const char *fqsn,
    258258    const char *opts, unsigned int flags, unsigned int instance)
    259259{
     
    342342}
    343343
    344 int unmount(const char *mpp)
     344int vfs_unmount_path(const char *mpp)
    345345{
    346346        int mp = vfs_lookup(mpp, WALK_MOUNT_POINT | WALK_DIRECTORY);
  • uspace/lib/c/include/vfs/vfs.h

    r6e5562a r80743a1  
    7575extern char *vfs_absolutize(const char *, size_t *);
    7676
    77 extern int mount(const char *, const char *, const char *, const char *,
    78     unsigned int, unsigned int);
    79 extern int unmount(const char *);
    80 
    8177extern int vfs_fhandle(FILE *, int *);
    8278
     
    9692extern int vfs_link(int, const char *, vfs_file_kind_t);
    9793extern int vfs_link_path(const char *, vfs_file_kind_t);
     94extern int vfs_mount_path(const char *, const char *, const char *,
     95    const char *, unsigned int, unsigned int);
     96extern int vfs_mount(int, const char *, service_id_t, const char *, unsigned,
     97    unsigned, int *);
    9898extern int vfs_resize(int, aoff64_t);
    9999extern int vfs_root(void);
     
    106106extern int vfs_unlink(int, const char *, int);
    107107extern int vfs_unlink_path(const char *);
     108extern int vfs_unmount(int);
     109extern int vfs_unmount_path(const char *);
    108110
    109 int vfs_mount(int, const char *, service_id_t, const char *, unsigned, unsigned, int *);
    110 int vfs_unmount(int);
    111111
    112112#endif
Note: See TracChangeset for help on using the changeset viewer.