summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorGreg Thelen2012-11-28 22:50:45 +0100
committerTejun Heo2012-11-28 22:52:14 +0100
commit9718ceb3431acdeee9bdec5c18e18266333970aa (patch)
tree5f8cf33738076409cf0c311100b2972c0571ec27 /kernel
parentcgroup: fix lockdep warning for event_control (diff)
downloadkernel-qcow2-linux-9718ceb3431acdeee9bdec5c18e18266333970aa.tar.gz
kernel-qcow2-linux-9718ceb3431acdeee9bdec5c18e18266333970aa.tar.xz
kernel-qcow2-linux-9718ceb3431acdeee9bdec5c18e18266333970aa.zip
cgroup: list_del_init() on removed events
Use list_del_init() rather than list_del() to remove events from cgrp->event_list. No functional change. This is just defensive coding. Signed-off-by: Greg Thelen <gthelen@google.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 589433f7a74b..46dcdbd7485b 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -3767,7 +3767,7 @@ static int cgroup_event_wake(wait_queue_t *wait, unsigned mode,
if (flags & POLLHUP) {
__remove_wait_queue(event->wqh, &event->wait);
spin_lock(&cgrp->event_list_lock);
- list_del(&event->list);
+ list_del_init(&event->list);
spin_unlock(&cgrp->event_list_lock);
/*
* We are in atomic context, but cgroup_event_remove() may
@@ -4341,7 +4341,7 @@ static int cgroup_destroy_locked(struct cgroup *cgrp)
list_splice_init(&cgrp->event_list, &tmp_list);
spin_unlock(&cgrp->event_list_lock);
list_for_each_entry_safe(event, tmp, &tmp_list, list) {
- list_del(&event->list);
+ list_del_init(&event->list);
remove_wait_queue(event->wqh, &event->wait);
eventfd_signal(event->eventfd, 1);
schedule_work(&event->remove);