From patchwork Thu Jul 11 02:13:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 13729933 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 7C03BC3DA41 for ; Thu, 11 Jul 2024 02:13:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C7C186B0099; Wed, 10 Jul 2024 22:13:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BD84D6B009A; Wed, 10 Jul 2024 22:13:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A54DD6B009C; Wed, 10 Jul 2024 22:13:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7ED036B0099 for ; Wed, 10 Jul 2024 22:13:35 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2C2FB1602F6 for ; Thu, 11 Jul 2024 02:13:35 +0000 (UTC) X-FDA: 82325850390.28.83C02FB Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf02.hostedemail.com (Postfix) with ESMTP id 73FAB80003 for ; Thu, 11 Jul 2024 02:13:33 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=gIwEu0h5; spf=pass (imf02.hostedemail.com: domain of 3zD-PZgYKCMM738qjxpxxpun.lxvurw36-vvt4jlt.x0p@flex--yuzhao.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3zD-PZgYKCMM738qjxpxxpun.lxvurw36-vvt4jlt.x0p@flex--yuzhao.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=1720663970; 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=6RCNHIc0/84Yq5SbDOD6xZQS6zwZu2n7K7QhObKOUEk=; b=JpcU6SB2QRhFrWmClmtjtmK79y2PEfkLgW08HXbYWPJicoE01YTDnIeNJoBccWYutXwOiw SWd56NOPWjgfbrU1T54Z5qBLPcegGxBbW+YTqht/W0o57jxQNHPLarh4gdTkx87sknNSgF cTaPl9/X1bxDAK2C0qv12+tva5FYfhE= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=gIwEu0h5; spf=pass (imf02.hostedemail.com: domain of 3zD-PZgYKCMM738qjxpxxpun.lxvurw36-vvt4jlt.x0p@flex--yuzhao.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3zD-PZgYKCMM738qjxpxxpun.lxvurw36-vvt4jlt.x0p@flex--yuzhao.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720663970; a=rsa-sha256; cv=none; b=btRJpmkSDB6zQEFFvU7v/jz8+Q90p9+OXgG0+HTrOgfNwoxSM2crixtBb7KXMDCqRh53C8 ZGImYWL9W/qumCSX3drmkvqM30Ea2kIcwzZlYGy1BZQsC+G6cbTsyzRtz5T61MAOrLemsz VrD0XhAEOCG20I3ww7Dd350xiV2ZSFg= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e036440617fso710017276.1 for ; Wed, 10 Jul 2024 19:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1720664012; x=1721268812; 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=6RCNHIc0/84Yq5SbDOD6xZQS6zwZu2n7K7QhObKOUEk=; b=gIwEu0h5X6ZykD+T7+JLq1hB4fWRGc1cRirc5tfsu3l1DbXPKxnUYlIMaSik+5XsCG Hp+mE3rCf+H+TdcC26N13tYGbbHKQu5AK0214tiSQkEZ9+rJJ47RYEHutQQr1f/0KEZf 6/fV7WAviCZq6ROXI97ifQ+73gKxLzsCd0FyfzwWJHSu1OoTUITVq2fjHwFYES5lw/yS ZCtda5+kgSp2SBfMHi7RipFdS6xVNLMW4+o6cl/jHLEjHZCv/tsNxGPlPDZkY3affDcL ZN2vbdnNN8A0oIQ4wvFud/UkoYQ5Kky4Mc1+Rn42q++9tioycYGnKQfGY9YW2WkCtUfB eoaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720664012; x=1721268812; 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=6RCNHIc0/84Yq5SbDOD6xZQS6zwZu2n7K7QhObKOUEk=; b=J4pxeOm1sX/rNWoCDaxTHZgvz75Qnf52e4NTrbWvnEKpOxfW2A58WRcNYjrYFIwCRB KZYalB87EbY4KIyhZxLo8mUuiuC897jcmc6oHFPunFtRLkj/X3nMFgS9VeD2f8ALdlrZ cxfUq1a27yF1vTCB3GM53+Z0dDaNlRt18CG7GKVKsaFZsq13W7Rv1LtlIOUyY4zVF5/d H5r6tWfFN50ZOUxexEW6DisLtjU279mFBOerg2gxvpmQbwEmHRkXXwVHuKdgGyQZn8MN 0CdzILdvHGcu2gaHkXElAr2ugY/4PHCDLslDdK2wnnFLsDjiJZ4oB33hCcwOqGzK9D77 XNzQ== X-Gm-Message-State: AOJu0YwkYiXirqcl040MucQEtXQG4k9OEZIOIDYM37MQp+dKxVdWGuOC 3Eu/c+QL+DJLb8ZW4fD7iSvmo+k6lJsAUOFJclel7khtdOQVVfnAAYgOYPytUy1HMbaeQzCa6RE Jlw== X-Google-Smtp-Source: AGHT+IGs4gFVi/kxatEGxz/B1lm3LDZuehH0XgpGsn3CIFnEqcrCXAfD8VgVg/nDjjGVQUAHTzXmxtBJ/OQ= X-Received: from yuzhao2.bld.corp.google.com ([2a00:79e0:2e28:6:9b06:2f28:6675:a98b]) (user=yuzhao job=sendgmr) by 2002:a05:6902:2101:b0:e03:31ec:8a24 with SMTP id 3f1490d57ef6-e041b17dfb5mr397954276.8.1720664012653; Wed, 10 Jul 2024 19:13:32 -0700 (PDT) Date: Wed, 10 Jul 2024 20:13:16 -0600 In-Reply-To: <20240711021317.596178-1-yuzhao@google.com> Mime-Version: 1.0 References: <20240711021317.596178-1-yuzhao@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Message-ID: <20240711021317.596178-5-yuzhao@google.com> Subject: [PATCH mm-unstable v1 4/5] mm/swap: remove remaining _fn suffix From: Yu Zhao To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yu Zhao X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 73FAB80003 X-Stat-Signature: dke8t938sakhfgggoqrmxrmwd8hzsi1y X-Rspam-User: X-HE-Tag: 1720664013-992600 X-HE-Meta: U2FsdGVkX18YEm5XgFSYckj2mTT4Un+ucFUQCNxjy++ZxHoNkx1ONXB9rtfaLqKLYCIV46AhXlsvcDci9HIP3y442uiYnuARzehTVhiZmEky+mykL1p/5cZu/Bz+jVZJW7VX1yE5CsvqkUwnNpfJyUhVyM9Qe8qktOnJ4Jr0AUeU91N3bwqfjW3gbCIvQ9VlzZltVR8ZoHfC3rDeOPjcwvH9heDZcCxVKKZcNuabFX+zCifp0aJki9IFIsusmmaLZrGxx2WKGLz1uzmUBVcYd8asit39C7GYpjq8nV9nSmVUhn1WoEManRSNOY2uzCV9eyHOQh02faGFnO6DkhbBpvPMDfA896R12aLxZrgjHfvu9UMO8BRZ1iuhkrQ3RA5CZGlou/7/7367AhC8ZgDuZ6pz1dZOOsL0VlwDjyd4dZoccF/TT8Kd32Tj35hoXrkLocR/QtzLiJhENrr8CscCvVpQpbtarTs09c5c5vMmUEtihlY0BPPo7QN/ivnrwub3Xi9vq8HGlRE5v06+0a+uwdprvh+NCiVpFdWIunU9IDtE9bAtW47CrvJqxYBlAozJlF5clLq/JF1V1yVZzc59eRO6PIQz9lxm+nGKboukBH31UbLvdPSQIQoWI05yluXzVNI9F+9zFockGaKIU1RykVYekSxGZVFwAFhbA/fToxOchySvR2EFS1BVdY/jLUhLk0h12uirEBW5RU2xWOwpzsWUvcaa78CJZLiyhIcC11OFrWHIza273S76OxRW7ObdUb9Tj5h9AYJyPLobKTGFTmNYQDv4gxzJHbhJE7mg1G065wgCpEXzjiIPvR4vxl/tz44yihbX91cQ/GTv9Dc7NQZ92jwjZ7FKnpqNzsYBciaVuz7j7h2Rw2E9tUOASJbiJOQd9Z4fCPoNWEZ9eUlD3RyTQydXsUabG23cKjYAlvesteJejyqRxBDJu03qSK6gUD3Ksu0oeU1Qj+vt5nu 34HmWpRj vfFtxr3GgBVlzHTo94PBy9pbGZMUDZtgwrWMmhtPHVSunNHekqU8hUFrstyG5vE6vJ35HAVIX1F1eWpWaXn7Ld9Cqm654krkxpekxC2fl8KxK5ZL2WL9/MTdLszUAQVHIF5MiWNJMftRYlSEcFaBp2QUh8H/Anir7xYs6qNz/CIhA38IXuzwpX4f0A4Y85HRn1sa+VqfKQwW/Qs50XFxP18Pb7zZmjJaT2LPzSFhqjUdlcMZejX3b5VTf/qUPTeptj/03NSByk/DlFDGYJEfr+uJob6awHkWSrAJJL4JufMFCLXU9amqh8vGhZ3F+Kj5b0W28Gnuf9ap5XEYYqgONR8hDnWfG/DFyNRvGOL/gmJdvo7pDDqZgYEl/B6bMbgMjYohDl+a7XMFaXmQu/yVGxeyvEMWjJd+johNB1ApcHlfNu6L3Rh40DjoxaDfkQFGqMSEUBRhbIPCy/JwfYfElSTOlNxWGkDrVmXicDv42/cY+9ejGxb3uWzwGircikRzO68TvLwLoAiB0QxdHYp1o0rnMViwHlrgkAXRIKsDU1CIhTgw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Remove remaining _fn suffix from cpu_fbatches handlers, which are already self-explanatory. Signed-off-by: Yu Zhao --- mm/swap.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mm/swap.c b/mm/swap.c index 774ae9eab1e6..4a66d2f87f26 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -160,7 +160,7 @@ EXPORT_SYMBOL(put_pages_list); typedef void (*move_fn_t)(struct lruvec *lruvec, struct folio *folio); -static void lru_add_fn(struct lruvec *lruvec, struct folio *folio) +static void lru_add(struct lruvec *lruvec, struct folio *folio) { int was_unevictable = folio_test_clear_unevictable(folio); long nr_pages = folio_nr_pages(folio); @@ -230,7 +230,7 @@ static void folio_batch_add_and_move(struct folio_batch *fbatch, folio_batch_move_lru(fbatch, move_fn); } -static void lru_move_tail_fn(struct lruvec *lruvec, struct folio *folio) +static void lru_move_tail(struct lruvec *lruvec, struct folio *folio) { if (folio_test_unevictable(folio)) return; @@ -265,7 +265,7 @@ void folio_rotate_reclaimable(struct folio *folio) local_lock_irqsave(&cpu_fbatches.lock_irq, flags); fbatch = this_cpu_ptr(&cpu_fbatches.lru_move_tail); - folio_batch_add_and_move(fbatch, folio, lru_move_tail_fn); + folio_batch_add_and_move(fbatch, folio, lru_move_tail); local_unlock_irqrestore(&cpu_fbatches.lock_irq, flags); } @@ -527,7 +527,7 @@ void folio_add_lru(struct folio *folio) folio_get(folio); local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.lru_add); - folio_batch_add_and_move(fbatch, folio, lru_add_fn); + folio_batch_add_and_move(fbatch, folio, lru_add); local_unlock(&cpu_fbatches.lock); } EXPORT_SYMBOL(folio_add_lru); @@ -571,7 +571,7 @@ void folio_add_lru_vma(struct folio *folio, struct vm_area_struct *vma) * written out by flusher threads as this is much more efficient * than the single-page writeout from reclaim. */ -static void lru_deactivate_file_fn(struct lruvec *lruvec, struct folio *folio) +static void lru_deactivate_file(struct lruvec *lruvec, struct folio *folio) { bool active = folio_test_active(folio); long nr_pages = folio_nr_pages(folio); @@ -612,7 +612,7 @@ static void lru_deactivate_file_fn(struct lruvec *lruvec, struct folio *folio) } } -static void lru_deactivate_fn(struct lruvec *lruvec, struct folio *folio) +static void lru_deactivate(struct lruvec *lruvec, struct folio *folio) { long nr_pages = folio_nr_pages(folio); @@ -628,7 +628,7 @@ static void lru_deactivate_fn(struct lruvec *lruvec, struct folio *folio) __count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, nr_pages); } -static void lru_lazyfree_fn(struct lruvec *lruvec, struct folio *folio) +static void lru_lazyfree(struct lruvec *lruvec, struct folio *folio) { long nr_pages = folio_nr_pages(folio); @@ -662,7 +662,7 @@ void lru_add_drain_cpu(int cpu) struct folio_batch *fbatch = &fbatches->lru_add; if (folio_batch_count(fbatch)) - folio_batch_move_lru(fbatch, lru_add_fn); + folio_batch_move_lru(fbatch, lru_add); fbatch = &fbatches->lru_move_tail; /* Disabling interrupts below acts as a compiler barrier. */ @@ -671,21 +671,21 @@ void lru_add_drain_cpu(int cpu) /* No harm done if a racing interrupt already did this */ local_lock_irqsave(&cpu_fbatches.lock_irq, flags); - folio_batch_move_lru(fbatch, lru_move_tail_fn); + folio_batch_move_lru(fbatch, lru_move_tail); local_unlock_irqrestore(&cpu_fbatches.lock_irq, flags); } fbatch = &fbatches->lru_deactivate_file; if (folio_batch_count(fbatch)) - folio_batch_move_lru(fbatch, lru_deactivate_file_fn); + folio_batch_move_lru(fbatch, lru_deactivate_file); fbatch = &fbatches->lru_deactivate; if (folio_batch_count(fbatch)) - folio_batch_move_lru(fbatch, lru_deactivate_fn); + folio_batch_move_lru(fbatch, lru_deactivate); fbatch = &fbatches->lru_lazyfree; if (folio_batch_count(fbatch)) - folio_batch_move_lru(fbatch, lru_lazyfree_fn); + folio_batch_move_lru(fbatch, lru_lazyfree); folio_activate_drain(cpu); } @@ -716,7 +716,7 @@ void deactivate_file_folio(struct folio *folio) local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.lru_deactivate_file); - folio_batch_add_and_move(fbatch, folio, lru_deactivate_file_fn); + folio_batch_add_and_move(fbatch, folio, lru_deactivate_file); local_unlock(&cpu_fbatches.lock); } @@ -743,7 +743,7 @@ void folio_deactivate(struct folio *folio) local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.lru_deactivate); - folio_batch_add_and_move(fbatch, folio, lru_deactivate_fn); + folio_batch_add_and_move(fbatch, folio, lru_deactivate); local_unlock(&cpu_fbatches.lock); } @@ -770,7 +770,7 @@ void folio_mark_lazyfree(struct folio *folio) local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.lru_lazyfree); - folio_batch_add_and_move(fbatch, folio, lru_lazyfree_fn); + folio_batch_add_and_move(fbatch, folio, lru_lazyfree); local_unlock(&cpu_fbatches.lock); }