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

Commit 7c5cae36 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] slab: use parameter passed to cache_reap to determine pointer to work structure 



Use the pointer passed to cache_reap to determine the work pointer and
consolidate exit paths.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8c8cc2c1

mm/slab.c

+7 −8
Original line number Diff line number Diff line
@@ -4029,18 +4029,17 @@ void drain_array(struct kmem_cache *cachep, struct kmem_list3 *l3, 
 * If we cannot acquire the cache chain mutex then just give up - we'll try

 * again on the next iteration.

 */

static void cache_reap(struct work_struct *unused)

static void cache_reap(struct work_struct *w)

{

	struct kmem_cache *searchp;

	struct kmem_list3 *l3;

	int node = numa_node_id();

	struct delayed_work *work =

		container_of(w, struct delayed_work, work);



	if (!mutex_trylock(&cache_chain_mutex)) {

	if (!mutex_trylock(&cache_chain_mutex))

		/* Give up. Setup the next iteration. */

		schedule_delayed_work(&__get_cpu_var(reap_work),

				      round_jiffies_relative(REAPTIMEOUT_CPUC));

		return;

	}

		goto out;



	list_for_each_entry(searchp, &cache_chain, next) {

		check_irq_on();
@@ -4083,9 +4082,9 @@ static void cache_reap(struct work_struct *unused) 
	mutex_unlock(&cache_chain_mutex);

	next_reap_node();

	refresh_cpu_vm_stats(smp_processor_id());

out:

	/* Set up the next iteration */

	schedule_delayed_work(&__get_cpu_var(reap_work),

		round_jiffies_relative(REAPTIMEOUT_CPUC));

	schedule_delayed_work(work, round_jiffies_relative(REAPTIMEOUT_CPUC));

}



#ifdef CONFIG_PROC_FS