Skip to contentSkip to conversation

ipc,rcu: convert call_rcu(ipc_immediate_free) to kfree_rcu()

PATCH In review Lai Jiangshan 1 participant 1 message Mar 18, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 32/36 ipc,rcu: convert call_rcu(ipc_immediate_free) to kfree_rcu()

The rcu callback ipc_immediate_free() just calls a kfree(), so we use kfree_rcu() instead of the call_rcu(ipc_immediate_free).

---
 ipc/util.c |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)
ipc/util.c +1 -15
index 69a0cc1..e6fb418 100644
@@ -576,19 +576,6 @@ static void ipc_schedule_free(struct rcu_head *head)
 	schedule_work(&sched->work);
 }
 
-/**
- * ipc_immediate_free - free ipc + rcu space
- * @head: RCU callback structure that contains pointer to be freed
- *
- * Free from the RCU callback context.
- */
-static void ipc_immediate_free(struct rcu_head *head)
-{
-	struct ipc_rcu_grace *free =
-		container_of(head, struct ipc_rcu_grace, rcu);
-	kfree(free);
-}
-
 void ipc_rcu_putref(void *ptr)
 {
 	if (--container_of(ptr, struct ipc_rcu_hdr, data)->refcount > 0)
@@ -598,8 +585,7 @@ void ipc_rcu_putref(void *ptr)
 		call_rcu(&container_of(ptr, struct ipc_rcu_grace, data)->rcu,
 				ipc_schedule_free);
 	} else {
-		call_rcu(&container_of(ptr, struct ipc_rcu_grace, data)->rcu,
-				ipc_immediate_free);
+		kfree_rcu(container_of(ptr, struct ipc_rcu_grace, data), rcu);
 	}
 }
 
Signature · 1 line
1.7.4