1 files changed, 7 insertions, 8 deletions

diff --git a/mm/slab.c b/mm/slab.c
index b595323e24a2..caa8f87e04eb 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -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 @@ next:
         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