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

Changeset 5863a95 in mainline for uspace/srv/vfs/vfs_ops.c


Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (diff), 11658b64 (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 development/ changes

File:
1 edited

Legend:

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

    r70e5ad5 r5863a95  
    7979        size_t rsize;
    8080        unsigned rlnkcnt;
    81         ipcarg_t rc;
     81        sysarg_t rc;
    8282        int phone;
    8383        aid_t msg;
     
    126126                        phone = vfs_grab_phone(fs_handle);
    127127                        msg = async_send_1(phone, VFS_OUT_MOUNTED,
    128                             (ipcarg_t) devmap_handle, &answer);
     128                            (sysarg_t) devmap_handle, &answer);
    129129                        /* send the mount options */
    130130                        rc = async_data_write_start(phone, (void *)opts,
     
    188188        phone = vfs_grab_phone(mp_res.triplet.fs_handle);
    189189        msg = async_send_4(phone, VFS_OUT_MOUNT,
    190             (ipcarg_t) mp_res.triplet.devmap_handle,
    191             (ipcarg_t) mp_res.triplet.index,
    192             (ipcarg_t) fs_handle,
    193             (ipcarg_t) devmap_handle, &answer);
     190            (sysarg_t) mp_res.triplet.devmap_handle,
     191            (sysarg_t) mp_res.triplet.index,
     192            (sysarg_t) fs_handle,
     193            (sysarg_t) devmap_handle, &answer);
    194194       
    195195        /* send connection */
     
    309309        ipc_call_t data;
    310310        ipc_callid_t callid = async_get_call(&data);
    311         if (IPC_GET_METHOD(data) != IPC_M_PING) {
     311        if (IPC_GET_IMETHOD(data) != IPC_M_PING) {
    312312                ipc_answer_0(callid, ENOTSUP);
    313313                ipc_answer_0(rid, ENOTSUP);
     
    716716
    717717        /* Wait for reply from the FS server. */
    718         ipcarg_t rc;
     718        sysarg_t rc;
    719719        async_wait_for(msg, &rc);
    720720       
     
    747747               
    748748                /* Wait for reply from the FS server. */
    749                 ipcarg_t rc;
     749                sysarg_t rc;
    750750                async_wait_for(msg, &rc);
    751751               
     
    839839         * don't have to bother.
    840840         */
    841         ipcarg_t rc;
     841        sysarg_t rc;
    842842        ipc_call_t answer;
    843843        if (read) {
     
    973973    fs_index_t index, aoff64_t size)
    974974{
    975         ipcarg_t rc;
     975        sysarg_t rc;
    976976        int fs_phone;
    977977       
    978978        fs_phone = vfs_grab_phone(fs_handle);
    979         rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t) devmap_handle,
    980             (ipcarg_t) index, LOWER32(size), UPPER32(size));
     979        rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (sysarg_t) devmap_handle,
     980            (sysarg_t) index, LOWER32(size), UPPER32(size));
    981981        vfs_release_phone(fs_handle, fs_phone);
    982982        return (int)rc;
     
    10051005
    10061006        fibril_mutex_unlock(&file->lock);
    1007         ipc_answer_0(rid, (ipcarg_t)rc);
     1007        ipc_answer_0(rid, (sysarg_t)rc);
    10081008}
    10091009
     
    10111011{
    10121012        int fd = IPC_GET_ARG1(*request);
    1013         ipcarg_t rc;
     1013        sysarg_t rc;
    10141014
    10151015        vfs_file_t *file = vfs_file_get(fd);
     
    10841084        ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
    10851085       
    1086         ipcarg_t rv;
     1086        sysarg_t rv;
    10871087        async_wait_for(msg, &rv);
    10881088        vfs_release_phone(node->fs_handle, fs_phone);
Note: See TracChangeset for help on using the changeset viewer.