Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 264510
b: refs/heads/master
c: d199798
h: refs/heads/master
v: v3
  • Loading branch information
David Howells authored and James Morris committed Aug 22, 2011
1 parent adb647f commit 63efd2e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b072e9bc2fe9aeff4e104e80e479160349f474a9
refs/heads/master: d199798bdf969873f78d48140600ff0a98a87e69
6 changes: 3 additions & 3 deletions trunk/security/keys/gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void key_schedule_gc(time_t gc_at)
kenter("%ld", gc_at - now);

if (gc_at <= now) {
schedule_work(&key_gc_work);
queue_work(system_nrt_wq, &key_gc_work);
} else if (gc_at < key_gc_next_run) {
expires = jiffies + (gc_at - now) * HZ;
mod_timer(&key_gc_timer, expires);
Expand All @@ -65,7 +65,7 @@ static void key_gc_timer_func(unsigned long data)
{
kenter("");
key_gc_next_run = LONG_MAX;
schedule_work(&key_gc_work);
queue_work(system_nrt_wq, &key_gc_work);
}

/*
Expand Down Expand Up @@ -206,7 +206,7 @@ static void key_gc_dead_links(struct work_struct *work)
key_gc_new_timer = new_timer;
key_gc_again = true;
clear_bit(0, &key_gc_executing);
schedule_work(&key_gc_work);
queue_work(system_nrt_wq, &key_gc_work);
kleave(" [continue]");
return;

Expand Down

0 comments on commit 63efd2e

Please sign in to comment.