Changeset 7bdcc45 in mainline for uspace/srv/fs


Ignore:
Timestamp:
2010-12-16T16:38:49Z (15 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.

Location:
uspace/srv/fs
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/fs/devfs/devfs.c

    r8e58f94 r7bdcc45  
    5353static vfs_info_t devfs_vfs_info = {
    5454        .name = NAME,
     55        .concurrent_read_write = false,
     56        .write_retains_size = false,
    5557};
    5658
    … …  
    6668                ipc_callid_t callid = async_get_call(&call);
    6769               
    68                 switch  (IPC_GET_METHOD(call)) {
     70                switch  (IPC_GET_IMETHOD(call)) {
    6971                case IPC_M_PHONE_HUNGUP:
    7072                        return;

  • uspace/srv/fs/devfs/devfs_ops.c

    r8e58f94 r7bdcc45  
    420420       
    421421        /* Accept the mount options */
    422         ipcarg_t retval = async_data_write_accept((void **) &opts, true, 0, 0,
     422        sysarg_t retval = async_data_write_accept((void **) &opts, true, 0, 0,
    423423            0, NULL);
    424424        if (retval != EOK) {
    … …  
    575575                /* Make a request at the driver */
    576576                ipc_call_t answer;
    577                 aid_t msg = async_send_3(dev->phone, IPC_GET_METHOD(*request),
     577                aid_t msg = async_send_3(dev->phone, IPC_GET_IMETHOD(*request),
    578578                    IPC_GET_ARG1(*request), IPC_GET_ARG2(*request),
    579579                    IPC_GET_ARG3(*request), &answer);
    … …  
    584584               
    585585                /* Wait for reply from the driver. */
    586                 ipcarg_t rc;
     586                sysarg_t rc;
    587587                async_wait_for(msg, &rc);
    588588                size_t bytes = IPC_GET_ARG1(answer);
    … …  
    638638                /* Make a request at the driver */
    639639                ipc_call_t answer;
    640                 aid_t msg = async_send_3(dev->phone, IPC_GET_METHOD(*request),
     640                aid_t msg = async_send_3(dev->phone, IPC_GET_IMETHOD(*request),
    641641                    IPC_GET_ARG1(*request), IPC_GET_ARG2(*request),
    642642                    IPC_GET_ARG3(*request), &answer);
    … …  
    648648               
    649649                /* Wait for reply from the driver. */
    650                 ipcarg_t rc;
     650                sysarg_t rc;
    651651                async_wait_for(msg, &rc);
    652652                size_t bytes = IPC_GET_ARG1(answer);
    … …  
    746746                /* Make a request at the driver */
    747747                ipc_call_t answer;
    748                 aid_t msg = async_send_2(dev->phone, IPC_GET_METHOD(*request),
     748                aid_t msg = async_send_2(dev->phone, IPC_GET_IMETHOD(*request),
    749749                    IPC_GET_ARG1(*request), IPC_GET_ARG2(*request), &answer);
    750750               
    … …  
    752752               
    753753                /* Wait for reply from the driver */
    754                 ipcarg_t rc;
     754                sysarg_t rc;
    755755                async_wait_for(msg, &rc);
    756756               

  • uspace/srv/fs/fat/fat.c

    r8e58f94 r7bdcc45  
    5252vfs_info_t fat_vfs_info = {
    5353        .name = NAME,
     54        .concurrent_read_write = false,
     55        .write_retains_size = false,   
    5456};
    5557
    … …  
    9193       
    9294                callid = async_get_call(&call);
    93                 switch  (IPC_GET_METHOD(call)) {
     95                switch  (IPC_GET_IMETHOD(call)) {
    9496                case IPC_M_PHONE_HUNGUP:
    9597                        return;

  • uspace/srv/fs/fat/fat_ops.c

    r8e58f94 r7bdcc45  
    12571257
    12581258        rc = fat_node_put(fn);
    1259         ipc_answer_1(rid, rc, (ipcarg_t)bytes);
     1259        ipc_answer_1(rid, rc, (sysarg_t)bytes);
    12601260}
    12611261

  • uspace/srv/fs/tmpfs/tmpfs.c

    r8e58f94 r7bdcc45  
    5757vfs_info_t tmpfs_vfs_info = {
    5858        .name = NAME,
     59        .concurrent_read_write = false,
     60        .write_retains_size = false,
    5961};
    6062
    … …  
    9799       
    98100                callid = async_get_call(&call);
    99                 switch  (IPC_GET_METHOD(call)) {
     101                switch  (IPC_GET_IMETHOD(call)) {
    100102                case IPC_M_PHONE_HUNGUP:
    101103                        return;
Note: See TracChangeset for help on using the changeset viewer.