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


Ignore:
Timestamp:
2017-03-05T20:23:05Z (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/vfs/vfs.h

    r1dff985 rc577a9a  
    129129typedef struct {
    130130        /** Serializes access to this open file. */
    131         fibril_mutex_t lock;
     131        fibril_mutex_t _lock;
    132132
    133133        vfs_node_t *node;
     
    202202extern void vfs_file_put(vfs_file_t *);
    203203extern int vfs_fd_assign(vfs_file_t *, int);
    204 extern int vfs_fd_alloc(bool desc);
     204extern int vfs_fd_alloc(vfs_file_t **file, bool desc);
    205205extern int vfs_fd_free(int);
    206206
Note: See TracChangeset for help on using the changeset viewer.