Changeset 5126f80 in mainline for uspace/lib/c/include


Ignore:
Timestamp:
2017-03-08T11:42:17Z (9 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0d35511
Parents:
a737667e
git-author:
Jiri Zarevucky <zarevucky.jiri@…> (2017-03-08 11:42:17)
git-committer:
Jakub Jermar <jakub@…> (2017-03-08 11:42:17)
Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1946

Original commit messages:

1946: Jiri Zarevucky 2013-08-06 Relativize mount, add root handle to libc and remove root from VFS server. This wraps up the "relativization" phase.

Breakage:

  • Dynamic builds broken
  • Mount table lookups by name
Location:
uspace/lib/c/include
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    ra737667e r5126f80  
    183183        WALK_REGULAR = (1 << 3),
    184184        WALK_DIRECTORY = (1 << 4),
     185        WALK_MOUNT_POINT = (1 << 5),
    185186       
    186187        WALK_ALL_FLAGS = WALK_MAY_CREATE | WALK_MUST_CREATE | WALK_REGULAR | WALK_DIRECTORY,
     188};
     189
     190enum {
     191        VFS_MOUNT_BLOCKING = 1,
     192        VFS_MOUNT_CONNECT_ONLY = 2,
     193        VFS_MOUNT_NO_REF = 4,
    187194};
    188195

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

    ra737667e r5126f80  
    5252extern char *vfs_absolutize(const char *, size_t *);
    5353
    54 extern int vfs_mount(const char *, const char *, const char *, const char *,
     54extern int mount(const char *, const char *, const char *, const char *,
    5555    unsigned int, unsigned int);
    56 extern int vfs_unmount(const char *);
     56extern int unmount(const char *);
    5757
    5858extern int vfs_fhandle(FILE *, int *);
    … …  
    6565extern int _vfs_walk(int, const char *, int);
    6666extern int _vfs_open(int, int);
    67 extern int vfs_lookup(const char *);
     67extern int vfs_lookup(const char *, int);
    6868
    6969extern int vfs_pass_handle(async_exch_t *, int, async_exch_t *);
    … …  
    7171
    7272extern int vfs_clone(int, bool);
     73extern int vfs_root(void);
     74extern void vfs_root_set(int);
     75
     76int vfs_mount(int, const char *, service_id_t, const char *, unsigned, unsigned, int *);
     77int vfs_unmount(int);
    7378
    7479#endif
Note: See TracChangeset for help on using the changeset viewer.