summaryrefslogtreecommitdiff
path: root/lib/klist.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-02-17 10:37:36 +0100
committerIngo Molnar <mingo@kernel.org>2016-02-17 10:37:36 +0100
commit9109dc97b0155e500cdf3bcd91507bc24defefc1 (patch)
tree5d721cbfeb3576dc6969093ab04f17666737b6a4 /lib/klist.c
parent27f6d22b037b2be6685e0e27cce929779d634119 (diff)
parent059fcd8cd16622da6513804a7a3e826d152c6c96 (diff)
Merge branch 'perf/urgent' into perf/core, to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/klist.c')
-rw-r--r--lib/klist.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/klist.c b/lib/klist.c
index d74cf7a29afdb..0507fa5d84c53 100644
--- a/lib/klist.c
+++ b/lib/klist.c
@@ -282,9 +282,9 @@ void klist_iter_init_node(struct klist *k, struct klist_iter *i,
struct klist_node *n)
{
i->i_klist = k;
- i->i_cur = n;
- if (n)
- kref_get(&n->n_ref);
+ i->i_cur = NULL;
+ if (n && kref_get_unless_zero(&n->n_ref))
+ i->i_cur = n;
}
EXPORT_SYMBOL_GPL(klist_iter_init_node);