1 files changed, 2 insertions, 70 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index f7f9d93f08d9..991a15f1e85f 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -21,7 +21,7 @@
 #include <linux/user_namespace.h>
 #include "internal.h"
 
-static struct kmem_cache        *key_jar;
+struct kmem_cache *key_jar;
 struct rb_root          key_serial_tree; /* tree of keys indexed by serial */
 DEFINE_SPINLOCK(key_serial_lock);
 
@@ -36,9 +36,6 @@ unsigned int key_quota_maxbytes = 20000;	/* general key space quota */
 static LIST_HEAD(key_types_list);
 static DECLARE_RWSEM(key_types_sem);
 
-static void key_cleanup(struct work_struct *work);
-static DECLARE_WORK(key_cleanup_task, key_cleanup);
-
 /* We serialise key instantiation and link */
 DEFINE_MUTEX(key_construction_mutex);
 
@@ -591,71 +588,6 @@ int key_reject_and_link(struct key *key,
 }
 EXPORT_SYMBOL(key_reject_and_link);
 
-/*
- * Garbage collect keys in process context so that we don't have to disable
- * interrupts all over the place.
- *
- * key_put() schedules this rather than trying to do the cleanup itself, which
- * means key_put() doesn't have to sleep.
- */
-static void key_cleanup(struct work_struct *work)
-{
-        struct rb_node *_n;
-        struct key *key;
-
-go_again:
-        /* look for a dead key in the tree */
-        spin_lock(&key_serial_lock);
-
-        for (_n = rb_first(&key_serial_tree); _n; _n = rb_next(_n)) {
-                key = rb_entry(_n, struct key, serial_node);
-
-                if (atomic_read(&key->usage) == 0)
-                        goto found_dead_key;
-        }
-
-        spin_unlock(&key_serial_lock);
-        return;
-
-found_dead_key:
-        /* we found a dead key - once we've removed it from the tree, we can
-         * drop the lock */
-        rb_erase(&key->serial_node, &key_serial_tree);
-        spin_unlock(&key_serial_lock);
-
-        key_check(key);
-
-        security_key_free(key);
-
-        /* deal with the user's key tracking and quota */
-        if (test_bit(KEY_FLAG_IN_QUOTA, &key->flags)) {
-                spin_lock(&key->user->lock);
-                key->user->qnkeys--;
-                key->user->qnbytes -= key->quotalen;
-                spin_unlock(&key->user->lock);
-        }
-
-        atomic_dec(&key->user->nkeys);
-        if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags))
-                atomic_dec(&key->user->nikeys);
-
-        key_user_put(key->user);
-
-        /* now throw away the key memory */
-        if (key->type->destroy)
-                key->type->destroy(key);
-
-        kfree(key->description);
-
-#ifdef KEY_DEBUGGING
-        key->magic = KEY_DEBUG_MAGIC_X;
-#endif
-        kmem_cache_free(key_jar, key);
-
-        /* there may, of course, be more than one key to destroy */
-        goto go_again;
-}
-
 /**
  * key_put - Discard a reference to a key.
  * @key: The key to discard a reference from.
@@ -670,7 +602,7 @@ void key_put(struct key *key)
                 key_check(key);
 
                 if (atomic_dec_and_test(&key->usage))
-                        schedule_work(&key_cleanup_task);
+                        schedule_work(&key_gc_unused_work);
         }
 }
 EXPORT_SYMBOL(key_put);