diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/gc.c | 8 | ||||
| -rw-r--r-- | security/keys/key.c | 2 |
2 files changed, 5 insertions, 5 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) | |||
| 62 | 62 | ||
| 63 | if (gc_at <= now || test_bit(KEY_GC_REAP_KEYTYPE, &key_gc_flags)) { | 63 | if (gc_at <= now || test_bit(KEY_GC_REAP_KEYTYPE, &key_gc_flags)) { |
| 64 | kdebug("IMMEDIATE"); | 64 | kdebug("IMMEDIATE"); |
| 65 | queue_work(system_nrt_wq, &key_gc_work); | 65 | schedule_work(&key_gc_work); |
| 66 | } else if (gc_at < key_gc_next_run) { | 66 | } else if (gc_at < key_gc_next_run) { |
| 67 | kdebug("DEFERRED"); | 67 | kdebug("DEFERRED"); |
| 68 | key_gc_next_run = gc_at; | 68 | key_gc_next_run = gc_at; |
| @@ -77,7 +77,7 @@ void key_schedule_gc(time_t gc_at) | |||
| 77 | void key_schedule_gc_links(void) | 77 | void key_schedule_gc_links(void) |
| 78 | { | 78 | { |
| 79 | set_bit(KEY_GC_KEY_EXPIRED, &key_gc_flags); | 79 | set_bit(KEY_GC_KEY_EXPIRED, &key_gc_flags); |
| 80 | queue_work(system_nrt_wq, &key_gc_work); | 80 | schedule_work(&key_gc_work); |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | /* | 83 | /* |
| @@ -120,7 +120,7 @@ void key_gc_keytype(struct key_type *ktype) | |||
| 120 | set_bit(KEY_GC_REAP_KEYTYPE, &key_gc_flags); | 120 | set_bit(KEY_GC_REAP_KEYTYPE, &key_gc_flags); |
| 121 | 121 | ||
| 122 | kdebug("schedule"); | 122 | kdebug("schedule"); |
| 123 | queue_work(system_nrt_wq, &key_gc_work); | 123 | schedule_work(&key_gc_work); |
| 124 | 124 | ||
| 125 | kdebug("sleep"); | 125 | kdebug("sleep"); |
| 126 | wait_on_bit(&key_gc_flags, KEY_GC_REAPING_KEYTYPE, key_gc_wait_bit, | 126 | wait_on_bit(&key_gc_flags, KEY_GC_REAPING_KEYTYPE, key_gc_wait_bit, |
| @@ -369,7 +369,7 @@ maybe_resched: | |||
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | if (gc_state & KEY_GC_REAP_AGAIN) | 371 | if (gc_state & KEY_GC_REAP_AGAIN) |
| 372 | queue_work(system_nrt_wq, &key_gc_work); | 372 | schedule_work(&key_gc_work); |
| 373 | kleave(" [end %x]", gc_state); | 373 | kleave(" [end %x]", gc_state); |
| 374 | return; | 374 | return; |
| 375 | 375 | ||
diff --git a/security/keys/key.c b/security/keys/key.c index 50d96d4e06f2..3cbe3529c418 100644 --- a/security/keys/key.c +++ b/security/keys/key.c | |||
| @@ -598,7 +598,7 @@ void key_put(struct key *key) | |||
| 598 | key_check(key); | 598 | key_check(key); |
| 599 | 599 | ||
| 600 | if (atomic_dec_and_test(&key->usage)) | 600 | if (atomic_dec_and_test(&key->usage)) |
| 601 | queue_work(system_nrt_wq, &key_gc_work); | 601 | schedule_work(&key_gc_work); |
| 602 | } | 602 | } |
| 603 | } | 603 | } |
| 604 | EXPORT_SYMBOL(key_put); | 604 | EXPORT_SYMBOL(key_put); |
