From patchwork Mon Nov 4 22:27:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keren Sun X-Patchwork-Id: 13862181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D16BD1CA06 for ; Mon, 4 Nov 2024 22:28:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C45D6B0083; Mon, 4 Nov 2024 17:28:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 04C9A6B0089; Mon, 4 Nov 2024 17:28:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2EC66B009A; Mon, 4 Nov 2024 17:28:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C227D6B0083 for ; Mon, 4 Nov 2024 17:28:11 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6F2C8160AF2 for ; Mon, 4 Nov 2024 22:28:11 +0000 (UTC) X-FDA: 82749850764.25.86B79AA Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf06.hostedemail.com (Postfix) with ESMTP id 94F3618001B for ; Mon, 4 Nov 2024 22:27:46 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=nbrsgBqG; spf=pass (imf06.hostedemail.com: domain of 3eEopZwgKCPEdXkXglngZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--kerensun.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3eEopZwgKCPEdXkXglngZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--kerensun.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730759124; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=15O9ca4pVZTESzuvBdGrLRHe530YHW6qwFu9Oe4DO8I=; b=LjmFWjlWVSd6xIrNfGhcLjEr3kVI7f0KMtrBK6tgCI+ucp11JN/OFWXJVvnvnsRm7T6xnn 38yCbE6PsZq7ZTrf+/dLBJIK7eDiH6scR9Wozq/OvjiZuQpjf/C9ZjKZ1yBQp9HTkfx3os GlKlWIcaCE87fO0KXEDDS36+0YRtFFw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=nbrsgBqG; spf=pass (imf06.hostedemail.com: domain of 3eEopZwgKCPEdXkXglngZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--kerensun.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3eEopZwgKCPEdXkXglngZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--kerensun.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730759124; a=rsa-sha256; cv=none; b=Lj5I7Ru+bxUo8ByhLvNVOsXsCRfli1AEp+QWPDfSSAUfBFHqCYp/XMoFhbnl4jUqRYkkwV wBNlbIQH+ZzM6EWIidc1iE9b0E1u4mnoNoGmv83gmOCrdK2KraHLgBbsPJD8tbZLrsxpYJ RrmdhdzwTFn1PSVrxdIoKAnR4AeF8IA= Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e2b9f2c6559so7294300276.2 for ; Mon, 04 Nov 2024 14:28:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730759288; x=1731364088; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=15O9ca4pVZTESzuvBdGrLRHe530YHW6qwFu9Oe4DO8I=; b=nbrsgBqGH6hbdKhqi0fGKt8sm4f85wqKJO7aXNi4OFD3Zygm84n/v91Kiwmfxwg4V5 uMYDCYp2YcgoCt5mqI7H4+qbuiCpKUYlwcv3OCxgBdkXmjGJ6JfG2oa5LB82RrSf6o/r tjdKZQF3de4wHmX7eRNtqfGjERz5Z+tHDtmRC/L13JN1kzZLXQUvMqOBzgW2EUrP7hLT fATmYaHpUpplzPalZpW/RBnOaU1zON5QeRy3Eq8+dPD0AJzVmt+H5RvKF9kF2qhyOZ8R 6LCYs3X5QDsHsNXcYjzkrLFnI1zJhfsK4kowcNc0K3ju2rV7GJQyvrhcgYVxk3FONo74 qqgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730759288; x=1731364088; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=15O9ca4pVZTESzuvBdGrLRHe530YHW6qwFu9Oe4DO8I=; b=XHFkqZqr6A3CbVzh2RP89As7GTtECx8NFqad6nMhytixMlvS/xWUmx1oe+klLxPs1+ vH5AvtA6zLFx6akWerNrSMmwjiDw3lwPvan6obBHxUoA6NVmKHgogI6On4DNiduuEg5w 2f9AVkiBdv66MGcrqj+1SGmYzuZo5SF28k+W2TeOIwd6QuGfl3YMlEJoDzivNOIE+AKV gTB8Oo6lLoGjhi56sQIxOHm/SRAcGP38ejWODkp8cBSunklKhpNk8IwWQC5cu4aqCNxP cv+u1VG/DIa4Rdi/2PekOFvGzI6sBXQ+z0CpaOGLbPzlXOXHxcEAzwioFDf0r9zSeYW3 7tHg== X-Forwarded-Encrypted: i=1; AJvYcCWV4lisV50O1aFa7v+9kF1fK3IAQ7pMgJL5xtooQNZ4aG4iW3FIMZBSOOmufDnJmaa2nPGfAd3XeA==@kvack.org X-Gm-Message-State: AOJu0YyCmsJF3baKo/2O4sn9hhWI6E+kF1akryc/VabIh8En+JPsvZV0 xtkMGB/BWLaQfhpZBminICxlOccuMIKT7lU74fJ07z1Mm+ctcyAtLZu2Lj5HFjtKa9vs3aMOfM2 I2nRz4x/+xw== X-Google-Smtp-Source: AGHT+IEpn3Ozfl3bEakiUcys3vke1g1CcEk4jHzka3T3PWfF9UiVOWvD6xNRzVdmFNyJHcOxgC4N0YzCvE4knA== X-Received: from kerensun.svl.corp.google.com ([2620:15c:2c5:11:2520:b863:90ba:85bc]) (user=kerensun job=sendgmr) by 2002:a25:b411:0:b0:e2b:da82:f695 with SMTP id 3f1490d57ef6-e30e5b0f56amr10735276.6.1730759288333; Mon, 04 Nov 2024 14:28:08 -0800 (PST) Date: Mon, 4 Nov 2024 14:27:35 -0800 In-Reply-To: <20241104222737.298130-1-kerensun@google.com> Mime-Version: 1.0 References: <20241104222737.298130-1-kerensun@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Message-ID: <20241104222737.298130-3-kerensun@google.com> Subject: [PATCH 2/4] mm: Fix minor formatting issues for mm control From: Keren Sun To: akpm@linux-foundation.org Cc: roman.gushchin@linux.dev, hannes@cmpxchg.org, mhocko@kernel.org, shakeel.butt@linux.dev, muchun.song@linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Keren Sun X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 94F3618001B X-Stat-Signature: tjrd7scwkis783f7xaet678amot6kbow X-Rspam-User: X-HE-Tag: 1730759266-272546 X-HE-Meta: U2FsdGVkX18g0E8e+SfTDMvaoTEkLKKsloKUdvsyFJv9MiNmu00vh32utcQ8Wt4ecrxoSYLjJxMq07kd18yGlgQb7Ievxqwy8ErohK2L2eBi1fgrK1Jk1GRXLHxWNXLGB4I2PG9kPwIlIrQ3x3vkbnR9VtCn1NF/1hfaK+5p+ISlBNA/AyczM/S1zwE9Es9RZqqGwqwcESgnf1tMZhI4bVMx3sdv5U5peeJEHqIFRO1vnqApaL5bgY9/wKbLlXg4XXsB+3U3OBP6U89X7V78tvPw2mQPA829gc+S/bp0kKybdhIuQAc8VqqorlDdtLUlS+vM0OLvMwNaU5jWDDhdrw7piZSsd7OLB+CRINOyc5y4k4dK4E7QgF02kBX5tkh25FsIpkkOvaoIwn6NICtx3H3aaD/lCNL9V+UbWblVNBCbbEa7ZLRzPNZqICFXRj2/+PbqGs0TkvjtAjb1GXoHXYs6hmgZNpTU1SDgN9g9NcG8ij5e7CYGytFAjF5kk4Pti0a497O+sqmp6nAwAMHu+AsVVj56dvWDBVPVd8bK1o57IUgrSR0Nq3LoOL7UeXL7E2u37L06xpLPwsV/VWidHjWvyEPKFlk0bQpe+UHXRn6Xw0YGEdbpIhYN67d5+OsiZp+B7kVNAA8dNBZdv+YU9dUXXFvsw95wbuPlaaivVouAumGiGynuCv/gJ1GvlZWorGpVm1JX+gJTT8rtXsBFC/nZbI3ozZrsma5BE16cpWveZTF/ADkN5ZtltZeSSLIJYHjWrWXN1OyISJb940eEZNQzn8euLcpfU9D0iApXXdovSlz4LtLnB0I5d1TLjyTRcMxY8BoJHyAxGh2w2XxDZaIIX/tTeSKK49oMdvjQxfvDHVUkGaCw3fag/1q7MsSPv8prG+4ceUK6NCa5Pf8DnLBeYOFDdmU1QxacoS73PeQyZdKeBrTTvu8WVCLA4X1JHFEidcWZNT7ibAHeLEn nzWfiIah NEkeuGtQQtwMJ9Tj9YNOgSqCzaML6NbOe8TFtMEtxY47G4HP07z0hjhmVICcpG+iLFlWBuQ3KCiWyLN/8Z+qeWr8yAVArEKg/4j5VSql7vcj1oyzjUdjOv+7evIhueUZxYMRCYc+qlydogSfzoQqifXe9iE617TxzodfGoS1VNObBYMhw3Bm+r9NUJM1onWt2ymkngQA0I36O6DsUnH8PZz+JfRSDLGgpH80IDDEhGD1E0bHswhaHelv62qkOC8NB8torjfSt+ZmkKVrPHl+aP4LRpTy3brqQazSSbGcrLAzzdvHOANqSPUNJfBJWas8cHOperlwI7ApVv4DMGx7z+apYCBTsaL3MgMWHx5UQyPNxGCrHoBdKKj28zDsBjRHcagMlbMJzJriK4L4vlUSR7dZN1kTHrqllkeiP9edM6yy3XEMbjSTU7OU+W3CL2ZHxpFKDRB1GaF2hoEnbyo00Z1fZN7/4OO9Uw/aVNwQQlMMT3h/ZJedyfWmlhMX+pjnNXJ22Pz4JXIXarRZo5bGWH9pgQwwSUWrVRZHMPtTTIAZ5N8DFw10GKlJlgg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000018, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add a line after declaration as it's missing after DEFINE_WAIT(), replace the spaces with tabs for indent, and remove the non-useful else after a break in a if statement. Signed-off-by: Keren Sun Acked-by: Shakeel Butt --- mm/memcontrol-v1.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 3951538bd73f..5f9d3d6d443c 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -460,6 +460,7 @@ bool memcg1_wait_acct_move(struct mem_cgroup *memcg) if (mc.moving_task && current != mc.moving_task) { if (mem_cgroup_under_move(memcg)) { DEFINE_WAIT(wait); + prepare_to_wait(&mc.waitq, &wait, TASK_INTERRUPTIBLE); /* moving charge context might have finished. */ if (mc.moving_task) @@ -490,7 +491,7 @@ void folio_memcg_lock(struct folio *folio) * The RCU lock is held throughout the transaction. The fast * path can get away without acquiring the memcg->move_lock * because page moving starts with an RCU grace period. - */ + */ rcu_read_lock(); if (mem_cgroup_disabled()) @@ -2096,8 +2097,8 @@ static bool mem_cgroup_oom_trylock(struct mem_cgroup *memcg) failed = iter; mem_cgroup_iter_break(memcg, iter); break; - } else - iter->oom_lock = true; + } + iter->oom_lock = true; } if (failed) {