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

Commit a95cded3 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

sysctl,rcu: Convert call_rcu(free_head) to kfree 



The RCU callback free_head just calls kfree(), so we can use kfree_rcu()
instead of call_rcu().

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 22a3c7d1

kernel/sysctl.c

+3 −8
Original line number Diff line number Diff line
@@ -1590,16 +1590,11 @@ void sysctl_head_get(struct ctl_table_header *head) 
	spin_unlock(&sysctl_lock);

}



static void free_head(struct rcu_head *rcu)

{

	kfree(container_of(rcu, struct ctl_table_header, rcu));

}



void sysctl_head_put(struct ctl_table_header *head)

{

	spin_lock(&sysctl_lock);

	if (!--head->count)

		call_rcu(&head->rcu, free_head);

		kfree_rcu(head, rcu);

	spin_unlock(&sysctl_lock);

}
@@ -1971,10 +1966,10 @@ void unregister_sysctl_table(struct ctl_table_header * header) 
	start_unregistering(header);

	if (!--header->parent->count) {

		WARN_ON(1);

		call_rcu(&header->parent->rcu, free_head);

		kfree_rcu(header->parent, rcu);

	}

	if (!--header->count)

		call_rcu(&header->rcu, free_head);

		kfree_rcu(header, rcu);

	spin_unlock(&sysctl_lock);

}