Changeset 77f0a1d in mainline for uspace/srv/vfs/vfs_ipc.c


Ignore:
Timestamp:
2018-03-22T22:54:52Z (6 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
eed4139
Parents:
a46e56b
Message:

Get rid of rid in favor of req_handle

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/vfs/vfs_ipc.c

    ra46e56b r77f0a1d  
    3535#include <vfs/canonify.h>
    3636
    37 static void vfs_in_clone(cap_call_handle_t rid, ipc_call_t *request)
     37static void vfs_in_clone(cap_call_handle_t req_handle, ipc_call_t *request)
    3838{
    3939        int oldfd = IPC_GET_ARG1(*request);
    … …  
    4343        int outfd = -1;
    4444        errno_t rc = vfs_op_clone(oldfd, newfd, desc, &outfd);
    45         async_answer_1(rid, rc, outfd);
    46 }
    47 
    48 static void vfs_in_fsprobe(cap_call_handle_t rid, ipc_call_t *request)
     45        async_answer_1(req_handle, rc, outfd);
     46}
     47
     48static void vfs_in_fsprobe(cap_call_handle_t req_handle, ipc_call_t *request)
    4949{
    5050        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
    … …  
    6262            FS_NAME_MAXLEN, 0, NULL);
    6363        if (rc != EOK) {
    64                 async_answer_0(rid, rc);
     64                async_answer_0(req_handle, rc);
    6565                return;
    6666        }
    6767
    6868        rc = vfs_op_fsprobe(fs_name, service_id, &info);
    69         async_answer_0(rid, rc);
     69        async_answer_0(req_handle, rc);
    7070        if (rc != EOK)
    7171                goto out;
    … …  
    8383}
    8484
    85 static void vfs_in_fstypes(cap_call_handle_t rid, ipc_call_t *request)
     85static void vfs_in_fstypes(cap_call_handle_t req_handle, ipc_call_t *request)
    8686{
    8787        cap_call_handle_t chandle;
    … …  
    9292        rc = vfs_get_fstypes(&fstypes);
    9393        if (rc != EOK) {
    94                 async_answer_0(rid, ENOMEM);
     94                async_answer_0(req_handle, ENOMEM);
    9595                return;
    9696        }
    9797
    9898        /* Send size of the data */
    99         async_answer_1(rid, EOK, fstypes.size);
     99        async_answer_1(req_handle, EOK, fstypes.size);
    100100
    101101        /* Now we should get a read request */
    … …  
    111111}
    112112
    113 static void vfs_in_mount(cap_call_handle_t rid, ipc_call_t *request)
     113static void vfs_in_mount(cap_call_handle_t req_handle, ipc_call_t *request)
    114114{
    115115        int mpfd = IPC_GET_ARG1(*request);
    … …  
    132132            MAX_MNTOPTS_LEN, 0, NULL);
    133133        if (rc != EOK) {
    134                 async_answer_0(rid, rc);
     134                async_answer_0(req_handle, rc);
    135135                return;
    136136        }
    … …  
    143143        if (rc != EOK) {
    144144                free(opts);
    145                 async_answer_0(rid, rc);
     145                async_answer_0(req_handle, rc);
    146146                return;
    147147        }
    … …  
    150150        rc = vfs_op_mount(mpfd, service_id, flags, instance, opts, fs_name,
    151151             &outfd);
    152         async_answer_1(rid, rc, outfd);
     152        async_answer_1(req_handle, rc, outfd);
    153153
    154154        free(opts);
    … …  
    156156}
    157157
    158 static void vfs_in_open(cap_call_handle_t rid, ipc_call_t *request)
     158static void vfs_in_open(cap_call_handle_t req_handle, ipc_call_t *request)
    159159{
    160160        int fd = IPC_GET_ARG1(*request);
    … …  
    162162
    163163        errno_t rc = vfs_op_open(fd, mode);
    164         async_answer_0(rid, rc);
    165 }
    166 
    167 static void vfs_in_put(cap_call_handle_t rid, ipc_call_t *request)
     164        async_answer_0(req_handle, rc);
     165}
     166
     167static void vfs_in_put(cap_call_handle_t req_handle, ipc_call_t *request)
    168168{
    169169        int fd = IPC_GET_ARG1(*request);
    170170        errno_t rc = vfs_op_put(fd);
    171         async_answer_0(rid, rc);
    172 }
    173 
    174 static void vfs_in_read(cap_call_handle_t rid, ipc_call_t *request)
     171        async_answer_0(req_handle, rc);
     172}
     173
     174static void vfs_in_read(cap_call_handle_t req_handle, ipc_call_t *request)
    175175{
    176176        int fd = IPC_GET_ARG1(*request);
    … …  
    180180        size_t bytes = 0;
    181181        errno_t rc = vfs_op_read(fd, pos, &bytes);
    182         async_answer_1(rid, rc, bytes);
    183 }
    184 
    185 static void vfs_in_rename(cap_call_handle_t rid, ipc_call_t *request)
     182        async_answer_1(req_handle, rc, bytes);
     183}
     184
     185static void vfs_in_rename(cap_call_handle_t req_handle, ipc_call_t *request)
    186186{
    187187        /* The common base directory. */
    … …  
    219219
    220220out:
    221         async_answer_0(rid, rc);
     221        async_answer_0(req_handle, rc);
    222222
    223223        if (old)
    … …  
    227227}
    228228
    229 static void vfs_in_resize(cap_call_handle_t rid, ipc_call_t *request)
     229static void vfs_in_resize(cap_call_handle_t req_handle, ipc_call_t *request)
    230230{
    231231        int fd = IPC_GET_ARG1(*request);
    232232        int64_t size = MERGE_LOUP32(IPC_GET_ARG2(*request), IPC_GET_ARG3(*request));
    233233        errno_t rc = vfs_op_resize(fd, size);
    234         async_answer_0(rid, rc);
    235 }
    236 
    237 static void vfs_in_stat(cap_call_handle_t rid, ipc_call_t *request)
     234        async_answer_0(req_handle, rc);
     235}
     236
     237static void vfs_in_stat(cap_call_handle_t req_handle, ipc_call_t *request)
    238238{
    239239        int fd = IPC_GET_ARG1(*request);
    240240        errno_t rc = vfs_op_stat(fd);
    241         async_answer_0(rid, rc);
    242 }
    243 
    244 static void vfs_in_statfs(cap_call_handle_t rid, ipc_call_t *request)
     241        async_answer_0(req_handle, rc);
     242}
     243
     244static void vfs_in_statfs(cap_call_handle_t req_handle, ipc_call_t *request)
    245245{
    246246        int fd = (int) IPC_GET_ARG1(*request);
    247247
    248248        errno_t rc = vfs_op_statfs(fd);
    249         async_answer_0(rid, rc);
    250 }
    251 
    252 static void vfs_in_sync(cap_call_handle_t rid, ipc_call_t *request)
     249        async_answer_0(req_handle, rc);
     250}
     251
     252static void vfs_in_sync(cap_call_handle_t req_handle, ipc_call_t *request)
    253253{
    254254        int fd = IPC_GET_ARG1(*request);
    255255        errno_t rc = vfs_op_sync(fd);
    256         async_answer_0(rid, rc);
    257 }
    258 
    259 static void vfs_in_unlink(cap_call_handle_t rid, ipc_call_t *request)
     256        async_answer_0(req_handle, rc);
     257}
     258
     259static void vfs_in_unlink(cap_call_handle_t req_handle, ipc_call_t *request)
    260260{
    261261        int parentfd = IPC_GET_ARG1(*request);
    … …  
    267267                rc = vfs_op_unlink(parentfd, expectfd, path);
    268268
    269         async_answer_0(rid, rc);
    270 }
    271 
    272 static void vfs_in_unmount(cap_call_handle_t rid, ipc_call_t *request)
     269        async_answer_0(req_handle, rc);
     270}
     271
     272static void vfs_in_unmount(cap_call_handle_t req_handle, ipc_call_t *request)
    273273{
    274274        int mpfd = IPC_GET_ARG1(*request);
    275275        errno_t rc = vfs_op_unmount(mpfd);
    276         async_answer_0(rid, rc);
    277 }
    278 
    279 static void vfs_in_wait_handle(cap_call_handle_t rid, ipc_call_t *request)
     276        async_answer_0(req_handle, rc);
     277}
     278
     279static void vfs_in_wait_handle(cap_call_handle_t req_handle, ipc_call_t *request)
    280280{
    281281        bool high_fd = IPC_GET_ARG1(*request);
    282282        int fd = -1;
    283283        errno_t rc = vfs_op_wait_handle(high_fd, &fd);
    284         async_answer_1(rid, rc, fd);
    285 }
    286 
    287 static void vfs_in_walk(cap_call_handle_t rid, ipc_call_t *request)
     284        async_answer_1(req_handle, rc, fd);
     285}
     286
     287static void vfs_in_walk(cap_call_handle_t req_handle, ipc_call_t *request)
    288288{
    289289        /*
    … …  
    301301                free(path);
    302302        }
    303         async_answer_1(rid, rc, fd);
    304 }
    305 
    306 static void vfs_in_write(cap_call_handle_t rid, ipc_call_t *request)
     303        async_answer_1(req_handle, rc, fd);
     304}
     305
     306static void vfs_in_write(cap_call_handle_t req_handle, ipc_call_t *request)
    307307{
    308308        int fd = IPC_GET_ARG1(*request);
    … …  
    312312        size_t bytes = 0;
    313313        errno_t rc = vfs_op_write(fd, pos, &bytes);
    314         async_answer_1(rid, rc, bytes);
     314        async_answer_1(req_handle, rc, bytes);
    315315}
    316316
Note: See TracChangeset for help on using the changeset viewer.