From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754124Ab1BTPRi (ORCPT ); Sun, 20 Feb 2011 10:17:38 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:46131 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751628Ab1BTPRd (ORCPT ); Sun, 20 Feb 2011 10:17:33 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=CayswAcPbuts6bNt5EF0M24h2v8FELj1SftnvK7ww2+oEMjsysYmyO9nRNb6phKkrb VwolJ3MvyNE2t8F1fgvs9UCjTtXaYFiobjJ2b3xO9//HcArXdYCr2Hyc6o3cfLhL3tbP 3QaBAFhXGqB/sVIN/aoQNMGVcNsnUDCWgWo7Y= From: Minchan Kim To: Andrew Morton Cc: linux-mm , LKML , Johannes Weiner , Balbir Singh , KAMEZAWA Hiroyuki , Daisuke Nishimura , Minchan Kim Subject: [PATCH v2 1/2] memcg: remove unnecessary BUG_ON Date: Mon, 21 Feb 2011 00:17:17 +0900 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now memcg in unmap_and_move checks BUG_ON of charge. But mem_cgroup_prepare_migration returns either 0 or -ENOMEM. If it returns -ENOMEM, it jumps out unlock without the check. If it returns 0, it can pass BUG_ON. So it's meaningless. Let's remove it. Cc: Johannes Weiner Cc: Balbir Singh Acked-by: Daisuke Nishimura Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Minchan Kim --- mm/migrate.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index eb083a6..2abc9c9 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -683,7 +683,6 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private, rc = -ENOMEM; goto unlock; } - BUG_ON(charge); if (PageWriteback(page)) { if (!force || !sync) -- 1.7.1