From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tejun Heo Subject: [PATCH 13/14] cgroup: don't use idr_remove_all() Date: Fri, 25 Jan 2013 17:31:11 -0800 Message-ID: <1359163872-1949-14-git-send-email-tj@kernel.org> References: <1359163872-1949-1-git-send-email-tj@kernel.org> 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=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=CF9CNovbwyPHq1eBareb5Dkf1lnJFDxBmURV25hUWfA=; b=G72+k5FeNpyTgcVDfqdQP4aXTCMUj5nZ25LeEjm8/O5zb9z84OJTiq0q45yHs5toTH yGCaf0GCvk03L0WZjKWMeyt/merkY659MpiLLXAe3Hj1IfavSbZZZEFAXX9JbPrYQv1U OS3thGSdQs8KBE6/hKSnPuFhiMmW+LhzEesEVpY9dJjCqqZXHWnczTnVstR+YsneksV7 yc2yitaO+efSA1UiUuRF36rvmY5f5J15+XwmzI1a0YB+VvfFM4je2com4RPRg8N13IlE LgPyq9MVnsehHO4v2n28Cl55pZ9W2n0P9vm+UNtiYBEFwO7vdEC9sUATTYDKAt67Zv6M 56Ew== In-Reply-To: <1359163872-1949-1-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@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: akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org Cc: containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, rusty-8n+1lVoiYb80n/F98K4Iww@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Tejun Heo , cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org idr_destroy() can destroy idr by itself and idr_remove_all() is being deprecated. Drop its usage. Signed-off-by: Tejun Heo Cc: Li Zefan Cc: containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org --- This patch depends on an earlier idr patch and given the trivial nature of the patch, I think it would be best to route these together through -mm. Please holler if there's any objection. Thanks. kernel/cgroup.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 4855892..6b18c5c 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -4567,10 +4567,8 @@ void cgroup_unload_subsys(struct cgroup_subsys *ss) offline_css(ss, dummytop); ss->active = 0; - if (ss->use_id) { - idr_remove_all(&ss->idr); + if (ss->use_id) idr_destroy(&ss->idr); - } /* deassign the subsys_id */ subsys[ss->subsys_id] = NULL; -- 1.8.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932098Ab3AZBcB (ORCPT ); Fri, 25 Jan 2013 20:32:01 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:34461 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755316Ab3AZBbm (ORCPT ); Fri, 25 Jan 2013 20:31:42 -0500 From: Tejun Heo To: akpm@linux-foundation.org Cc: rusty@rustcorp.com.au, linux-kernel@vger.kernel.org, Tejun Heo , Li Zefan , containers@lists.linux-foundation.org, cgroups@vger.kernel.org Subject: [PATCH 13/14] cgroup: don't use idr_remove_all() Date: Fri, 25 Jan 2013 17:31:11 -0800 Message-Id: <1359163872-1949-14-git-send-email-tj@kernel.org> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1359163872-1949-1-git-send-email-tj@kernel.org> References: <1359163872-1949-1-git-send-email-tj@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org idr_destroy() can destroy idr by itself and idr_remove_all() is being deprecated. Drop its usage. Signed-off-by: Tejun Heo Cc: Li Zefan Cc: containers@lists.linux-foundation.org Cc: cgroups@vger.kernel.org --- This patch depends on an earlier idr patch and given the trivial nature of the patch, I think it would be best to route these together through -mm. Please holler if there's any objection. Thanks. kernel/cgroup.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 4855892..6b18c5c 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -4567,10 +4567,8 @@ void cgroup_unload_subsys(struct cgroup_subsys *ss) offline_css(ss, dummytop); ss->active = 0; - if (ss->use_id) { - idr_remove_all(&ss->idr); + if (ss->use_id) idr_destroy(&ss->idr); - } /* deassign the subsys_id */ subsys[ss->subsys_id] = NULL; -- 1.8.1