Changeset eb13ef8 in mainline for uspace/srv/vfs

Timestamp:

2019-02-06T13:25:12Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fafb8e5

Parents:

bb97118

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-02 14:04:02)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-06 13:25:12)

Message:

Change IPC_GET_* and IPC_SET_* to accept pointer instead of lvalue

Location:

uspace/srv/vfs

Files:

• vfs.c (modified) (2 diffs)
• vfs_file.c (modified) (1 diff)
• vfs_ipc.c (modified) (18 diffs)
• vfs_lookup.c (modified) (1 diff)
• vfs_ops.c (modified) (4 diffs)
• vfs_pager.c (modified) (1 diff)

uspace/srv/vfs/vfs.c

@@ -62 +62 @@
                 async_get_call(&call);
 
-                if (!IPC_GET_IMETHOD(call)) {
+                if (!IPC_GET_IMETHOD(&call)) {
                         async_answer_0(&call, EOK);
                         break;
                 }
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_IMETHOD(&call)) {
                 case IPC_M_PAGE_IN:
                         vfs_page_in(&call);
@@ -80 +80 @@
 static void notification_handler(ipc_call_t *call, void *arg)
 {
-        if (IPC_GET_ARG1(*call) == VFS_PASS_HANDLE)
+        if (IPC_GET_ARG1(call) == VFS_PASS_HANDLE)
                 vfs_op_pass_handle(
-                    (task_id_t) MERGE_LOUP32(IPC_GET_ARG4(*call),
-                    IPC_GET_ARG5(*call)), call->task_id,
-                    (int) IPC_GET_ARG2(*call));
+                    (task_id_t) MERGE_LOUP32(IPC_GET_ARG4(call),
+                    IPC_GET_ARG5(call)), call->task_id,
+                    (int) IPC_GET_ARG2(call));
 }
 

uspace/srv/vfs/vfs_file.c

@@ -148 +148 @@
         async_wait_for(msg, &rc);
 
-        return IPC_GET_RETVAL(answer);
+        return IPC_GET_RETVAL(&answer);
 }
 

uspace/srv/vfs/vfs_ipc.c

@@ -37 +37 @@
 static void vfs_in_clone(ipc_call_t *req)
 {
-        int oldfd = IPC_GET_ARG1(*req);
-        int newfd = IPC_GET_ARG2(*req);
-        bool desc = IPC_GET_ARG3(*req);
+        int oldfd = IPC_GET_ARG1(req);
+        int newfd = IPC_GET_ARG2(req);
+        bool desc = IPC_GET_ARG3(req);
 
         int outfd = -1;
@@ -48 +48 @@
 static void vfs_in_fsprobe(ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
+        service_id_t service_id = (service_id_t) IPC_GET_ARG1(req);
         char *fs_name = NULL;
         vfs_fs_probe_info_t info;
@@ -113 +113 @@
 static void vfs_in_mount(ipc_call_t *req)
 {
-        int mpfd = IPC_GET_ARG1(*req);
+        int mpfd = IPC_GET_ARG1(req);
 
         /*
@@ -120 +120 @@
          * in the request.
          */
-        service_id_t service_id = (service_id_t) IPC_GET_ARG2(*req);
-
-        unsigned int flags = (unsigned int) IPC_GET_ARG3(*req);
-        unsigned int instance = IPC_GET_ARG4(*req);
+        service_id_t service_id = (service_id_t) IPC_GET_ARG2(req);
+
+        unsigned int flags = (unsigned int) IPC_GET_ARG3(req);
+        unsigned int instance = IPC_GET_ARG4(req);
 
         char *opts = NULL;
@@ -159 +159 @@
 static void vfs_in_open(ipc_call_t *req)
 {
-        int fd = IPC_GET_ARG1(*req);
-        int mode = IPC_GET_ARG2(*req);
+        int fd = IPC_GET_ARG1(req);
+        int mode = IPC_GET_ARG2(req);
 
         errno_t rc = vfs_op_open(fd, mode);
@@ -168 +168 @@
 static void vfs_in_put(ipc_call_t *req)
 {
-        int fd = IPC_GET_ARG1(*req);
+        int fd = IPC_GET_ARG1(req);
         errno_t rc = vfs_op_put(fd);
         async_answer_0(req, rc);
@@ -175 +175 @@
 static void vfs_in_read(ipc_call_t *req)
 {
-        int fd = IPC_GET_ARG1(*req);
-        aoff64_t pos = MERGE_LOUP32(IPC_GET_ARG2(*req),
-            IPC_GET_ARG3(*req));
+        int fd = IPC_GET_ARG1(req);
+        aoff64_t pos = MERGE_LOUP32(IPC_GET_ARG2(req),
+            IPC_GET_ARG3(req));
 
         size_t bytes = 0;
@@ -192 +192 @@
         errno_t rc;
 
-        basefd = IPC_GET_ARG1(*req);
+        basefd = IPC_GET_ARG1(req);
 
         /* Retrieve the old path. */
@@ -230 +230 @@
 static void vfs_in_resize(ipc_call_t *req)
 {
-        int fd = IPC_GET_ARG1(*req);
-        int64_t size = MERGE_LOUP32(IPC_GET_ARG2(*req), IPC_GET_ARG3(*req));
+        int fd = IPC_GET_ARG1(req);
+        int64_t size = MERGE_LOUP32(IPC_GET_ARG2(req), IPC_GET_ARG3(req));
         errno_t rc = vfs_op_resize(fd, size);
         async_answer_0(req, rc);
@@ -238 +238 @@
 static void vfs_in_stat(ipc_call_t *req)
 {
-        int fd = IPC_GET_ARG1(*req);
+        int fd = IPC_GET_ARG1(req);
         errno_t rc = vfs_op_stat(fd);
         async_answer_0(req, rc);
@@ -245 +245 @@
 static void vfs_in_statfs(ipc_call_t *req)
 {
-        int fd = (int) IPC_GET_ARG1(*req);
+        int fd = (int) IPC_GET_ARG1(req);
 
         errno_t rc = vfs_op_statfs(fd);
@@ -253 +253 @@
 static void vfs_in_sync(ipc_call_t *req)
 {
-        int fd = IPC_GET_ARG1(*req);
+        int fd = IPC_GET_ARG1(req);
         errno_t rc = vfs_op_sync(fd);
         async_answer_0(req, rc);
@@ -260 +260 @@
 static void vfs_in_unlink(ipc_call_t *req)
 {
-        int parentfd = IPC_GET_ARG1(*req);
-        int expectfd = IPC_GET_ARG2(*req);
+        int parentfd = IPC_GET_ARG1(req);
+        int expectfd = IPC_GET_ARG2(req);
 
         char *path;
@@ -273 +273 @@
 static void vfs_in_unmount(ipc_call_t *req)
 {
-        int mpfd = IPC_GET_ARG1(*req);
+        int mpfd = IPC_GET_ARG1(req);
         errno_t rc = vfs_op_unmount(mpfd);
         async_answer_0(req, rc);
@@ -280 +280 @@
 static void vfs_in_wait_handle(ipc_call_t *req)
 {
-        bool high_fd = IPC_GET_ARG1(*req);
+        bool high_fd = IPC_GET_ARG1(req);
         int fd = -1;
         errno_t rc = vfs_op_wait_handle(high_fd, &fd);
@@ -292 +292 @@
          * For defined flags, see <ipc/vfs.h>.
          */
-        int parentfd = IPC_GET_ARG1(*req);
-        int flags = IPC_GET_ARG2(*req);
+        int parentfd = IPC_GET_ARG1(req);
+        int flags = IPC_GET_ARG2(req);
 
         int fd = 0;
@@ -307 +307 @@
 static void vfs_in_write(ipc_call_t *req)
 {
-        int fd = IPC_GET_ARG1(*req);
-        aoff64_t pos = MERGE_LOUP32(IPC_GET_ARG2(*req),
-            IPC_GET_ARG3(*req));
+        int fd = IPC_GET_ARG1(req);
+        aoff64_t pos = MERGE_LOUP32(IPC_GET_ARG2(req),
+            IPC_GET_ARG3(req));
 
         size_t bytes = 0;
@@ -330 +330 @@
                 async_get_call(&call);
 
-                if (!IPC_GET_IMETHOD(call)) {
+                if (!IPC_GET_IMETHOD(&call)) {
                         async_answer_0(&call, EOK);
                         break;
                 }
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_IMETHOD(&call)) {
                 case VFS_IN_CLONE:
                         vfs_in_clone(&call);

uspace/srv/vfs/vfs_lookup.c

@@ -226 +226 @@
 
         unsigned last = *pfirst + *plen;
-        *pfirst = IPC_GET_ARG3(answer) & 0xffff;
+        *pfirst = IPC_GET_ARG3(&answer) & 0xffff;
         *plen = last - *pfirst;
 
-        result->triplet.fs_handle = (fs_handle_t) IPC_GET_ARG1(answer);
+        result->triplet.fs_handle = (fs_handle_t) IPC_GET_ARG1(&answer);
         result->triplet.service_id = base->service_id;
-        result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
-        result->size = MERGE_LOUP32(IPC_GET_ARG4(answer), IPC_GET_ARG5(answer));
-        result->type = (IPC_GET_ARG3(answer) >> 16) ?
+        result->triplet.index = (fs_index_t) IPC_GET_ARG2(&answer);
+        result->size = MERGE_LOUP32(IPC_GET_ARG4(&answer), IPC_GET_ARG5(&answer));
+        result->type = (IPC_GET_ARG3(&answer) >> 16) ?
             VFS_NODE_DIRECTORY : VFS_NODE_FILE;
         return EOK;

uspace/srv/vfs/vfs_ops.c

@@ -168 +168 @@
         res.triplet.fs_handle = fs_handle;
         res.triplet.service_id = service_id;
-        res.triplet.index = (fs_index_t) IPC_GET_ARG1(answer);
-        res.size = (int64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
-            IPC_GET_ARG3(answer));
+        res.triplet.index = (fs_index_t) IPC_GET_ARG1(&answer);
+        res.size = (int64_t) MERGE_LOUP32(IPC_GET_ARG2(&answer),
+            IPC_GET_ARG3(&answer));
         res.type = VFS_NODE_DIRECTORY;
 
@@ -374 +374 @@
         }
 
-        *bytes = IPC_GET_ARG1(*answer);
+        *bytes = IPC_GET_ARG1(answer);
         return rc;
 }
@@ -401 +401 @@
         async_wait_for(msg, &rc);
 
-        chunk->size = IPC_GET_ARG1(*answer);
+        chunk->size = IPC_GET_ARG1(answer);
 
         return (errno_t) rc;
@@ -488 +488 @@
                 /* Update the cached version of node's size. */
                 if (rc == EOK) {
-                        file->node->size = MERGE_LOUP32(IPC_GET_ARG2(answer),
-                            IPC_GET_ARG3(answer));
+                        file->node->size = MERGE_LOUP32(IPC_GET_ARG2(&answer),
+                            IPC_GET_ARG3(&answer));
                 }
                 fibril_rwlock_write_unlock(&file->node->contents_rwlock);

uspace/srv/vfs/vfs_pager.c

@@ -44 +44 @@
 void vfs_page_in(ipc_call_t *req)
 {
-        aoff64_t offset = IPC_GET_ARG1(*req);
-        size_t page_size = IPC_GET_ARG2(*req);
-        int fd = IPC_GET_ARG3(*req);
+        aoff64_t offset = IPC_GET_ARG1(req);
+        size_t page_size = IPC_GET_ARG2(req);
+        int fd = IPC_GET_ARG3(req);
         void *page;
         errno_t rc;