From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Thelen Subject: [PATCH 2/2] cgroup: list_del_init() on removed events Date: Wed, 28 Nov 2012 13:50:45 -0800 Message-ID: <1354139445-6685-2-git-send-email-gthelen@google.com> References: <1354139445-6685-1-git-send-email-gthelen@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=uXtI2dTJxqwqaRmDfq6WcRmX6BV8vC7UMc1kV3yLyEQ=; b=KJ25eaOJN0CHGEub4cuX/5UvSKif4JoJXolWj7ZaNh3NoJJd6Ef8FSZ9+a5/BxRh6O 6LG3D95CkIco4iHMuNXPsHaMuLXvJnp9YNWswQMdr3HP97flH8skFfaJmd+v9NCzxhMt WPyxPNO6LZtQIh11Ak7mQy2ac0fANLo+AtmHBWcBH4EhYa9m0/x6DdGE6R9is4vnZL46 F/G83xWA4m0q5EQ7Sy7uCTRJ4l8A51F0EZvcUicR7GOI5218r/GHSk5GnHix/UNFOZhU eTsmBfW8yGBywngt5CSvG9aV45+uiWVYYAzn79+Ons/fyNESTG+2uzqP4KKQCBYa9957 xDsw== In-Reply-To: <1354139445-6685-1-git-send-email-gthelen-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Tejun Heo , Li Zefan Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org 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 --- kernel/cgroup.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/cgroup.c b/kernel/cgroup.c index a0d75bb..44c319d 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -3766,7 +3766,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 @@ -4340,7 +4340,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); -- 1.7.7.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932697Ab2K1Vuw (ORCPT ); Wed, 28 Nov 2012 16:50:52 -0500 Received: from mail-ea0-f202.google.com ([209.85.215.202]:50816 "EHLO mail-ea0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932658Ab2K1Vuu (ORCPT ); Wed, 28 Nov 2012 16:50:50 -0500 From: Greg Thelen To: Tejun Heo , Li Zefan Cc: containers@lists.linux-foundation.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Thelen Subject: [PATCH 2/2] cgroup: list_del_init() on removed events Date: Wed, 28 Nov 2012 13:50:45 -0800 Message-Id: <1354139445-6685-2-git-send-email-gthelen@google.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1354139445-6685-1-git-send-email-gthelen@google.com> References: <1354139445-6685-1-git-send-email-gthelen@google.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- kernel/cgroup.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/cgroup.c b/kernel/cgroup.c index a0d75bb..44c319d 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -3766,7 +3766,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 @@ -4340,7 +4340,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); -- 1.7.7.3