Changeset d51a0d6 in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2017-11-21T22:23:00Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

35f2bb1b

Parents:

c4c6025

Message:

Associate a kobject_t with a call_t

Let all the reference counting be done on call_t::kobject.

File:

• kernel/generic/src/ipc/sysipc.c (modified) (6 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -286 +286 @@
 #endif
 
-                ipc_call_hold(call);
+                kobject_add_ref(call->kobject);
                 rc = ipc_call_sync(kobj->phone, call);
                 spinlock_lock(&call->forget_lock);
                 bool forgotten = call->forget;
                 spinlock_unlock(&call->forget_lock);
-                ipc_call_release(call);
+                kobject_put(call->kobject);
 
 #ifdef CONFIG_UDEBUG
@@ -306 +306 @@
                                  * deallocation.
                                  */
-                                ipc_call_free(call);
+                                kobject_put(call->kobject);
                         } else {
                                 /*
@@ -323 +323 @@
         
         memcpy(data->args, call->data.args, sizeof(data->args));
-        ipc_call_free(call);
+        kobject_put(call->kobject);
         kobject_put(kobj);
         
@@ -420 +420 @@
             sizeof(call->data.args));
         if (rc != 0) {
-                ipc_call_free(call);
+                kobject_put(call->kobject);
                 kobject_put(kobj);
                 return (sysarg_t) rc;
@@ -753 +753 @@
                 STRUCT_TO_USPACE(calldata, &call->data);
                 
-                ipc_call_free(call);
+                kobject_put(call->kobject);
                 
                 return ((sysarg_t) call) | IPC_CALLID_NOTIFICATION;
@@ -762 +762 @@
                 
                 if (call->flags & IPC_CALL_DISCARD_ANSWER) {
-                        ipc_call_free(call);
+                        kobject_put(call->kobject);
                         goto restart;
                 }
                 
                 STRUCT_TO_USPACE(calldata, &call->data);
-                ipc_call_free(call);
+                kobject_put(call->kobject);
                 
                 return ((sysarg_t) call) | IPC_CALLID_ANSWERED;