linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
To: "linux-mm@kvack.org" <linux-mm@kvack.org>
Cc: "cgroups@vger.kernel.org" <cgroups@vger.kernel.org>,
	Michal Hocko <mhocko@suse.cz>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Han Ying <yinghan@google.com>,
	Glauber Costa <glommer@parallels.com>, Tejun Heo <tj@kernel.org>,
	"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Hiroyuki Kamezawa <kamezawa.hiroyuki@gmail.com>,
	Linux Kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH v3 1/6] memcg: fix error code in hugetlb_force_memcg_empty()
Date: Fri, 11 May 2012 18:45:18 +0900	[thread overview]
Message-ID: <4FACDFAE.5050808@jp.fujitsu.com> (raw)
In-Reply-To: <4FACDED0.3020400@jp.fujitsu.com>

The conditions are handled as -EBUSY, _now_.

Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
---
 mm/hugetlb.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 1d3c8ea9..824f07b 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1922,8 +1922,11 @@ int hugetlb_force_memcg_empty(struct cgroup *cgroup)
 	int ret = 0, idx = 0;
 
 	do {
-		if (cgroup_task_count(cgroup) || !list_empty(&cgroup->children))
+		if (cgroup_task_count(cgroup)
+			|| !list_empty(&cgroup->children)) {
+			ret = -EBUSY;
 			goto out;
+		}
 		/*
 		 * If the task doing the cgroup_rmdir got a signal
 		 * we don't really need to loop till the hugetlb resource
-- 
1.7.4.1


--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  reply	other threads:[~2012-05-11  9:47 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-11  9:41 [PATCH v3][0/6] memcg: prevent -ENOMEM in pre_destroy() KAMEZAWA Hiroyuki
2012-05-11  9:45 ` KAMEZAWA Hiroyuki [this message]
2012-05-11 21:17   ` [PATCH v3 1/6] memcg: fix error code in hugetlb_force_memcg_empty() Andrew Morton
2012-05-14  1:07     ` KAMEZAWA Hiroyuki
2012-05-14 18:15   ` Tejun Heo
2012-05-14 18:32     ` Tejun Heo
2012-05-15  1:10       ` KAMEZAWA Hiroyuki
2012-05-15 15:12         ` Tejun Heo
2012-05-11  9:47 ` [PATCH 2/6] add res_counter_uncharge_until() KAMEZAWA Hiroyuki
2012-05-11 21:19   ` Andrew Morton
2012-05-14  1:10     ` KAMEZAWA Hiroyuki
2012-05-14 10:08       ` Frederic Weisbecker
2012-05-14 10:32         ` KAMEZAWA Hiroyuki
2012-05-14 10:56           ` Frederic Weisbecker
2012-05-14 18:17           ` Tejun Heo
2012-05-11  9:48 ` [PATCH v3 3/6] memcg: use res_counter_uncharge_until in move_parent() KAMEZAWA Hiroyuki
2012-05-11  9:49 ` [PATCH v3 4/6] memcg: move charges to root cgroup if use_hierarchy=0 KAMEZAWA Hiroyuki
2012-05-14 20:14   ` Tejun Heo
2012-05-15  0:04     ` KAMEZAWA Hiroyuki
2012-05-11  9:50 ` [PATCH v3 5/6] memcg: don't uncharge in mem_cgroup_move_account KAMEZAWA Hiroyuki
2012-05-11  9:53 ` [PATCH v3 6/6] remove __must_check for res_counter_charge_nofail() KAMEZAWA Hiroyuki
2012-05-14 20:09   ` Tejun Heo
2012-05-15  0:02     ` KAMEZAWA Hiroyuki
2012-06-21 20:20 ` [PATCH v3][0/6] memcg: prevent -ENOMEM in pre_destroy() Tejun Heo
2012-06-21 23:27   ` Kamezawa Hiroyuki
2012-06-27 17:58     ` Tejun Heo
2012-06-28  8:33       ` Kamezawa Hiroyuki
2012-06-28 16:06         ` Tejun Heo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4FACDFAE.5050808@jp.fujitsu.com \
    --to=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=akpm@linux-foundation.org \
    --cc=aneesh.kumar@linux.vnet.ibm.com \
    --cc=cgroups@vger.kernel.org \
    --cc=fweisbec@gmail.com \
    --cc=glommer@parallels.com \
    --cc=hannes@cmpxchg.org \
    --cc=kamezawa.hiroyuki@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@suse.cz \
    --cc=tj@kernel.org \
    --cc=yinghan@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox