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

Changeset a9b6bec in mainline for uspace/lib/fs/libfs.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/lib/fs/libfs.c

    r37f7cfe ra9b6bec  
    155155        devmap_handle_t mr_devmap_handle = (devmap_handle_t) IPC_GET_ARG4(*request);
    156156        int res;
    157         ipcarg_t rc;
     157        sysarg_t rc;
    158158       
    159159        ipc_call_t call;
     
    163163        callid = async_get_call(&call);
    164164        int mountee_phone = (int) IPC_GET_ARG1(call);
    165         if ((IPC_GET_METHOD(call) != IPC_M_CONNECTION_CLONE) ||
     165        if ((IPC_GET_IMETHOD(call) != IPC_M_CONNECTION_CLONE) ||
    166166            (mountee_phone < 0)) {
    167167                ipc_answer_0(callid, EINVAL);
Note: See TracChangeset for help on using the changeset viewer.