3 files changed, 5 insertions, 7 deletions

diff --git a/security/keys/gc.c b/security/keys/gc.c
index 61ab7c82ebb1..d67c97bb1025 100644
--- a/security/keys/gc.c
+++ b/security/keys/gc.c
@@ -62,7 +62,7 @@ void key_schedule_gc(time_t gc_at)
 
         if (gc_at <= now || test_bit(KEY_GC_REAP_KEYTYPE, &key_gc_flags)) {
                 kdebug("IMMEDIATE");
-                queue_work(system_nrt_wq, &key_gc_work);
+                schedule_work(&key_gc_work);
         } else if (gc_at < key_gc_next_run) {
                 kdebug("DEFERRED");
                 key_gc_next_run = gc_at;
@@ -77,7 +77,7 @@ void key_schedule_gc(time_t gc_at)
 void key_schedule_gc_links(void)
 {
         set_bit(KEY_GC_KEY_EXPIRED, &key_gc_flags);
-        queue_work(system_nrt_wq, &key_gc_work);
+        schedule_work(&key_gc_work);
 }
 
 /*
@@ -120,7 +120,7 @@ void key_gc_keytype(struct key_type *ktype)
         set_bit(KEY_GC_REAP_KEYTYPE, &key_gc_flags);
 
         kdebug("schedule");
-        queue_work(system_nrt_wq, &key_gc_work);
+        schedule_work(&key_gc_work);
 
         kdebug("sleep");
         wait_on_bit(&key_gc_flags, KEY_GC_REAPING_KEYTYPE, key_gc_wait_bit,
@@ -369,7 +369,7 @@ maybe_resched:
         }
 
         if (gc_state & KEY_GC_REAP_AGAIN)
-                queue_work(system_nrt_wq, &key_gc_work);
+                schedule_work(&key_gc_work);
         kleave(" [end %x]", gc_state);
         return;
 
diff --git a/security/keys/key.c b/security/keys/key.c
index 4289c5ba2710..a30e92734905 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -591,7 +591,7 @@ void key_put(struct key *key)
                 key_check(key);
 
                 if (atomic_dec_and_test(&key->usage))
-                        queue_work(system_nrt_wq, &key_gc_work);
+                        schedule_work(&key_gc_work);
         }
 }
 EXPORT_SYMBOL(key_put);
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 1ecc0f79906e..305ecb76519c 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1496,7 +1496,6 @@ long keyctl_session_to_parent(void)
         oldwork = NULL;
         parent = me->real_parent;
 
-        task_lock(parent);
         /* the parent mustn't be init and mustn't be a kernel thread */
         if (parent->pid <= 1 || !parent->mm)
                 goto unlock;
@@ -1540,7 +1539,6 @@ long keyctl_session_to_parent(void)
         if (!ret)
                 newwork = NULL;
 unlock:
-        task_unlock(parent);
         write_unlock_irq(&tasklist_lock);
         rcu_read_unlock();
         if (oldwork)