Changeset 7bdcc45 in mainline for uspace/srv/vfs/vfs.h


Ignore:
Timestamp:
2010-12-16T16:38:49Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7837101
Parents:
8e58f94 (diff), eb221e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/vfs/vfs.h

    r8e58f94 r7bdcc45  
    5454        fs_handle_t fs_handle;
    5555        fibril_mutex_t phone_lock;
    56         ipcarg_t phone;
     56        sysarg_t phone;
    5757} fs_info_t;
    5858
    … …  
    172172
    173173extern fs_handle_t fs_name_to_handle(char *, bool);
     174extern vfs_info_t *fs_handle_to_info(fs_handle_t);
    174175
    175176extern int vfs_lookup_internal(char *, int, vfs_lookup_res_t *,
Note: See TracChangeset for help on using the changeset viewer.