Changeset 80743a1 in mainline for uspace/lib/c

Timestamp:

2017-04-01T06:49:10Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b19e892

Parents:

6e5562a

Message:

Rename (un)mount to vfs_(un)mount_path

Location:

uspace/lib/c

Files:

• generic/vfs/vfs.c (modified) (2 diffs)
• include/vfs/vfs.h (modified) (3 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -255 +255 @@
 }
 
-int mount(const char *fs_name, const char *mp, const char *fqsn,
+int vfs_mount_path(const char *mp, const char *fs_name, const char *fqsn,
     const char *opts, unsigned int flags, unsigned int instance)
 {
@@ -342 +342 @@
 }
 
-int unmount(const char *mpp)
+int vfs_unmount_path(const char *mpp)
 {
         int mp = vfs_lookup(mpp, WALK_MOUNT_POINT | WALK_DIRECTORY);

uspace/lib/c/include/vfs/vfs.h

@@ -75 +75 @@
 extern char *vfs_absolutize(const char *, size_t *);
 
-extern int mount(const char *, const char *, const char *, const char *,
-    unsigned int, unsigned int);
-extern int unmount(const char *);
-
 extern int vfs_fhandle(FILE *, int *);
 
@@ -96 +92 @@
 extern int vfs_link(int, const char *, vfs_file_kind_t);
 extern int vfs_link_path(const char *, vfs_file_kind_t);
+extern int vfs_mount_path(const char *, const char *, const char *,
+    const char *, unsigned int, unsigned int);
+extern int vfs_mount(int, const char *, service_id_t, const char *, unsigned,
+    unsigned, int *);
 extern int vfs_resize(int, aoff64_t);
 extern int vfs_root(void);
@@ -106 +106 @@
 extern int vfs_unlink(int, const char *, int);
 extern int vfs_unlink_path(const char *);
+extern int vfs_unmount(int);
+extern int vfs_unmount_path(const char *);
 
-int vfs_mount(int, const char *, service_id_t, const char *, unsigned, unsigned, int *);
-int vfs_unmount(int);
 
 #endif