Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for uspace/srv/vfs/vfs_register.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/vfs/vfs_register.c

    r37f7cfe ra9b6bec  
    177177        ipc_call_t call;
    178178        ipc_callid_t callid = async_get_call(&call);
    179         if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
    180                 dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
     179        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
     180                dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call));
    181181                list_remove(&fs_info->fs_link);
    182182                fibril_mutex_unlock(&fs_head_lock);
     
    197197        size_t size;
    198198        if (!async_share_in_receive(&callid, &size)) {
    199                 dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
     199                dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call));
    200200                list_remove(&fs_info->fs_link);
    201201                fibril_mutex_unlock(&fs_head_lock);
     
    235235         */
    236236        fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
    237         ipc_answer_1(rid, EOK, (ipcarg_t) fs_info->fs_handle);
     237        ipc_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
    238238       
    239239        fibril_condvar_broadcast(&fs_head_cv);
Note: See TracChangeset for help on using the changeset viewer.