Changeset f9d0a86 in mainline for kernel/generic/src/cap/cap.c

Timestamp:

2017-11-14T12:24:42Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

6cad776

Parents:

887c9de (diff), d2d142a (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.

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)

Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

File:

• kernel/generic/src/cap/cap.c (modified) (5 diffs)

kernel/generic/src/cap/cap.c

@@ -84 +84 @@
 
 static slab_cache_t *cap_slab;
-
-static kobject_t *cap_unpublish_locked(task_t *, cap_handle_t, kobject_type_t);
 
 static size_t caps_hash(const ht_link_t *item)
@@ -150 +148 @@
 void caps_task_init(task_t *task)
 {
-        mutex_initialize(&task->cap_info->lock, MUTEX_PASSIVE);
+        mutex_initialize(&task->cap_info->lock, MUTEX_RECURSIVE);
 
         for (kobject_type_t t = 0; t < KOBJECT_TYPE_MAX; t++)
@@ -240 +238 @@
         if (cap->state == CAP_STATE_PUBLISHED && cap->kobject->ops->reclaim &&
             cap->kobject->ops->reclaim(cap->kobject)) {
-                kobject_t *kobj = cap_unpublish_locked(cap->task, cap->handle,
+                kobject_t *kobj = cap_unpublish(cap->task, cap->handle,
                     cap->kobject->type);
                 kobject_put(kobj);
@@ -320 +318 @@
 }
 
-static kobject_t *
-cap_unpublish_locked(task_t *task, cap_handle_t handle, kobject_type_t type)
+/** Unpublish published capability
+ *
+ * The kernel object is moved out of the capability. In other words, the
+ * capability's reference to the objects is handed over to the kernel object
+ * pointer returned by this function. Once unpublished, the capability does not
+ * refer to any kernel object anymore.
+ *
+ * @param task    Task in which to unpublish the capability.
+ * @param handle  Capability handle.
+ * @param type    Kernel object type of the object associated with the
+ *                capability.
+ */
+kobject_t *cap_unpublish(task_t *task, cap_handle_t handle, kobject_type_t type)
 {
         kobject_t *kobj = NULL;
 
+        mutex_lock(&task->cap_info->lock);
         cap_t *cap = cap_get(task, handle, CAP_STATE_PUBLISHED);
         if (cap) {
@@ -335 +345 @@
                 }
         }
-
-        return kobj;
-}
-
-/** Unpublish published capability
- *
- * The kernel object is moved out of the capability. In other words, the
- * capability's reference to the objects is handed over to the kernel object
- * pointer returned by this function. Once unpublished, the capability does not
- * refer to any kernel object anymore.
- *
- * @param task    Task in which to unpublish the capability.
- * @param handle  Capability handle.
- * @param type    Kernel object type of the object associated with the
- *                capability.
- */
-kobject_t *cap_unpublish(task_t *task, cap_handle_t handle, kobject_type_t type)
-{
-
-        mutex_lock(&task->cap_info->lock);
-        kobject_t *kobj = cap_unpublish_locked(task, handle, type);
         mutex_unlock(&task->cap_info->lock);