Changeset 984a9ba in mainline for uspace/srv/fs/mfs/mfs_ops.c

Timestamp:

2018-07-05T09:34:09Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

63d46341

Parents:

76f566d

Message:

do not expose the call capability handler from the async framework

Keep the call capability handler encapsulated within the async framework
and do not expose it explicitly via its API. Use the pointer to
ipc_call_t as the sole object identifying an IPC call in the code that
uses the async framework.

This plugs a major leak in the abstraction and also simplifies both the
async framework (slightly) and all IPC servers.

File:

• uspace/srv/fs/mfs/mfs_ops.c (modified) (9 diffs)

uspace/srv/fs/mfs/mfs_ops.c

@@ -839 +839 @@
         struct mfs_ino_info *ino_i;
         size_t len, bytes = 0;
-        cap_call_handle_t chandle;
+        ipc_call_t call;
 
         mnode = fn->data;
         ino_i = mnode->ino_i;
 
-        if (!async_data_read_receive(&chandle, &len)) {
+        if (!async_data_read_receive(&call, &len)) {
                 rc = EINVAL;
                 goto out_error;
@@ -871 +871 @@
 
                 rc = mfs_node_put(fn);
-                async_answer_0(chandle, rc != EOK ? rc : ENOENT);
+                async_answer_0(&call, rc != EOK ? rc : ENOENT);
                 return rc;
         found:
-                async_data_read_finalize(chandle, d_info.d_name,
+                async_data_read_finalize(&call, d_info.d_name,
                     str_size(d_info.d_name) + 1);
                 bytes = ((pos - spos) + 1);
@@ -883 +883 @@
                         /* Trying to read beyond the end of file */
                         bytes = 0;
-                        (void) async_data_read_finalize(chandle, NULL, 0);
+                        (void) async_data_read_finalize(&call, NULL, 0);
                         goto out_success;
                 }
@@ -905 +905 @@
                         }
                         memset(buf, 0, sizeof(sbi->block_size));
-                        async_data_read_finalize(chandle,
+                        async_data_read_finalize(&call,
                             buf + pos % sbi->block_size, bytes);
                         free(buf);
@@ -915 +915 @@
                         goto out_error;
 
-                async_data_read_finalize(chandle, b->data +
+                async_data_read_finalize(&call, b->data +
                     pos % sbi->block_size, bytes);
 
@@ -930 +930 @@
 out_error:
         tmp = mfs_node_put(fn);
-        async_answer_0(chandle, tmp != EOK ? tmp : rc);
+        async_answer_0(&call, tmp != EOK ? tmp : rc);
         return tmp != EOK ? tmp : rc;
 }
@@ -948 +948 @@
                 return ENOENT;
 
-        cap_call_handle_t chandle;
+        ipc_call_t call;
         size_t len;
 
-        if (!async_data_write_receive(&chandle, &len)) {
+        if (!async_data_write_receive(&call, &len)) {
                 r = EINVAL;
                 goto out_err;
@@ -994 +994 @@
                 memset(b->data, 0, sbi->block_size);
 
-        async_data_write_finalize(chandle, b->data + (pos % bs), bytes);
+        async_data_write_finalize(&call, b->data + (pos % bs), bytes);
         b->dirty = true;
 
@@ -1014 +1014 @@
 out_err:
         mfs_node_put(fn);
-        async_answer_0(chandle, r);
+        async_answer_0(&call, r);
         return r;
 }