Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4ee9aa3 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Paul E. McKenney
Browse files

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).

Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 693a8b6e

ipc/util.c

+1 −15
Original line number Diff line number Diff line
@@ -579,19 +579,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)
@@ -601,8 +588,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);

	}

}