diff options
Diffstat (limited to 'lib/timerqueue.c')
-rw-r--r-- | lib/timerqueue.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/timerqueue.c b/lib/timerqueue.c index a382e4a32609..782ae8ca2c06 100644 --- a/lib/timerqueue.c +++ b/lib/timerqueue.c | |||
@@ -36,7 +36,7 @@ | |||
36 | * Adds the timer node to the timerqueue, sorted by the | 36 | * Adds the timer node to the timerqueue, sorted by the |
37 | * node's expires value. | 37 | * node's expires value. |
38 | */ | 38 | */ |
39 | void timerqueue_add(struct timerqueue_head *head, struct timerqueue_node *node) | 39 | bool timerqueue_add(struct timerqueue_head *head, struct timerqueue_node *node) |
40 | { | 40 | { |
41 | struct rb_node **p = &head->head.rb_node; | 41 | struct rb_node **p = &head->head.rb_node; |
42 | struct rb_node *parent = NULL; | 42 | struct rb_node *parent = NULL; |
@@ -56,8 +56,11 @@ void timerqueue_add(struct timerqueue_head *head, struct timerqueue_node *node) | |||
56 | rb_link_node(&node->node, parent, p); | 56 | rb_link_node(&node->node, parent, p); |
57 | rb_insert_color(&node->node, &head->head); | 57 | rb_insert_color(&node->node, &head->head); |
58 | 58 | ||
59 | if (!head->next || node->expires.tv64 < head->next->expires.tv64) | 59 | if (!head->next || node->expires.tv64 < head->next->expires.tv64) { |
60 | head->next = node; | 60 | head->next = node; |
61 | return true; | ||
62 | } | ||
63 | return false; | ||
61 | } | 64 | } |
62 | EXPORT_SYMBOL_GPL(timerqueue_add); | 65 | EXPORT_SYMBOL_GPL(timerqueue_add); |
63 | 66 | ||
@@ -69,7 +72,7 @@ EXPORT_SYMBOL_GPL(timerqueue_add); | |||
69 | * | 72 | * |
70 | * Removes the timer node from the timerqueue. | 73 | * Removes the timer node from the timerqueue. |
71 | */ | 74 | */ |
72 | void timerqueue_del(struct timerqueue_head *head, struct timerqueue_node *node) | 75 | bool timerqueue_del(struct timerqueue_head *head, struct timerqueue_node *node) |
73 | { | 76 | { |
74 | WARN_ON_ONCE(RB_EMPTY_NODE(&node->node)); | 77 | WARN_ON_ONCE(RB_EMPTY_NODE(&node->node)); |
75 | 78 | ||
@@ -82,6 +85,7 @@ void timerqueue_del(struct timerqueue_head *head, struct timerqueue_node *node) | |||
82 | } | 85 | } |
83 | rb_erase(&node->node, &head->head); | 86 | rb_erase(&node->node, &head->head); |
84 | RB_CLEAR_NODE(&node->node); | 87 | RB_CLEAR_NODE(&node->node); |
88 | return head->next != NULL; | ||
85 | } | 89 | } |
86 | EXPORT_SYMBOL_GPL(timerqueue_del); | 90 | EXPORT_SYMBOL_GPL(timerqueue_del); |
87 | 91 | ||