Changeset c577a9a in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2017-03-05T20:23:05Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

354b642

Parents:

1dff985

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-05 20:23:05)

git-committer:

Jakub Jermar <jakub@…> (2017-03-05 20:23:05)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5 revisions 1929-1930

File:

• uspace/srv/vfs/vfs.h (modified) (2 diffs)

uspace/srv/vfs/vfs.h

@@ -129 +129 @@
 typedef struct {
         /** Serializes access to this open file. */
-        fibril_mutex_t lock;
+        fibril_mutex_t _lock;
 
         vfs_node_t *node;
@@ -202 +202 @@
 extern void vfs_file_put(vfs_file_t *);
 extern int vfs_fd_assign(vfs_file_t *, int);
-extern int vfs_fd_alloc(bool desc);
+extern int vfs_fd_alloc(vfs_file_t **file, bool desc);
 extern int vfs_fd_free(int);