Received-SPF: pass (google.com: domain of linux-kernel+bounces-143193-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, willy@infradead.org, linmiaohe@huawei.com,
        jane.chu@oracle.com, muchun.song@linux.dev, nao.horiguchi@gmail.com,
        osalvador@suse.de, Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v2 2/2] mm/hugetlb: rename dissolve_free_huge_pages() to dissolve_free_hugetlb_folios()
Date: Fri, 12 Apr 2024 11:21:39 -0700
Message-ID: <20240412182139.120871-2-sidhartha.kumar@oracle.com>
In-Reply-To: <20240412182139.120871-1-sidhartha.kumar@oracle.com>
References: <20240412182139.120871-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?0FxkmCbnLajc9G0j1hVNzQhgQYfm04MhnXar+Ad2VRjzzBjeytPic7ZCTCAJ?=
 =?us-ascii?Q?zRAwyp5g6SRr51mWKZcI0YoLSltdIfq4P1sC8bQztqYWphKlR0tZisNHPURV?=
 =?us-ascii?Q?gukr8sFgqOFRSBoGYupPjRniIy3CHDA1Jt7Bl17fP8Dm/Lt2L/J/+bq6rV2y?=
 =?us-ascii?Q?45VsZghB/uqUJpVhTcVlfP1M1xUxv/fgY4luQRHbNORFwOUIOS6lEBXNl+cS?=
 =?us-ascii?Q?EUMo4U2P9aurOcwsgblq1E5/4EFK4dseAB6x90HRSzVT5GYFBM8uBDZfK8WK?=
 =?us-ascii?Q?6lAn76DbcUE15A054u9RJC73+LnkqocEGMqgAA0FZ0tgAl4pq+xkNu3AOMs6?=
 =?us-ascii?Q?RQhimQRKLE2LHCC4WO1NcVZKjZwLyZ2Rj/No6EdRJusGese5r/TJ7oQm0nZS?=
 =?us-ascii?Q?+lnafK/fAYgcUK/9k26gnpXYfTLB1GDWVQoU13mAT64XqY1w2p/zADnt9o1n?=
 =?us-ascii?Q?V7dAEn9lFSvvV0pYkhKr0oKTRfCvl6ro2fiEFq0F+z0ItpVWa9vjVVqSWVEH?=
 =?us-ascii?Q?YM7D+eddOpTtK8kdQWdRnnvQtkm3BbjoEzdZlC0/z+cWnZ/uaDxskaMs+GMQ?=
 =?us-ascii?Q?7JPNTWpc0RXo6/x2DHD4teLIocRbCcm4p1I58P2b/HDaYXcqsX7v8SBNErN/?=
 =?us-ascii?Q?HzUTqDv6VteU1WG0TgN35f931fV5hFiqbo3u7r4iXTtx0nimgu+b+HKPM6Ti?=
 =?us-ascii?Q?A4uWnpjRjCp7fzkWUm6rnCDMVp8fqE7LuYQpxIYkkvHVT1sXcwkWGz3DkL4W?=
 =?us-ascii?Q?bEgXZONoDJEIj6Kj8c/z9QLfcpgkfjJ+rKJQgR1KZRVru9eChHzJwg8bqI+W?=
 =?us-ascii?Q?KkOBAE0x/WqaMYJ1dbAUNOWel0PMRiMqY+PTcLuvs2+obwTq9Ilie88uz4cG?=
 =?us-ascii?Q?cny2ksBKeiihQg+RUtEvlVxJ35yFOssmYhNbOsUfFNpdmxhFwC2ek01mEV13?=
 =?us-ascii?Q?oKSJQrPNv9rFP3GD4GbCjg0EFZWsOk+czKA7Zeu6yzyQy5j0sKleuQsKc7v7?=
 =?us-ascii?Q?xD7KDg9XYgCUcK+XSH2qspm4nMyzfjlFYJlyyUQhLVuSMu73Vh5YW5yYyLL0?=
 =?us-ascii?Q?uwP/J4s8rSuLyTnx7DkZB3o4DSpROMTzrsUn6Lil+CO91o43p8s/crCE9VO1?=
 =?us-ascii?Q?w2QAne77mRaiasPnJLyS46DbjGxqflc8VuyyiQj+YmZLm2hNSdG3yAslQvye?=
 =?us-ascii?Q?bQOLPAqGj7BPxZHtebqhw2SMmxBK+bdNmCoOM/z8ED+7bc/mTbl8WTFdatos?=
 =?us-ascii?Q?YU2iqxrNGTjDfbc1zAzWg9BDuEECFAfEIiJmKkjISgk+v6mUAlzlj5+FhAAA?=
 =?us-ascii?Q?MhanCqBGhGIcf6+bIBwZcy7I9BUOc84uJiVlC8NxVqOxTmR0k9CIkAPaUkyT?=
 =?us-ascii?Q?KnWDMfjcbNe0BQ+eG3Lz3R5XJ30xzRafRW6/lUbaTXUWK+x6DY+yIJrf7Rg2?=
 =?us-ascii?Q?QB0zx0MVFir0ovz7ogMGQDyzMRBl5bwhYQrssssXlVmqUrAM/GUHs0J3CeWO?=
 =?us-ascii?Q?F/U9LNDgA+2fuLZk4N7rLfk4m82zF9RgsAwy9SIsnw/gGQTfNAiR6RBNtf2q?=
 =?us-ascii?Q?+dEk0/C5C3O1WFWIxoIyjxErugdTOOCb1BLKCWXeB3Yq25uPIcnN6tOYzOJV?=
 =?us-ascii?Q?OBiIfO6CTrNyYaQOGUghARY=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	dqfDmTFI2zhJvJswE07YsxxgT3z4F4G3Lq6kU5L+26DMZGqbZHh5hH2YSkAX79PeP+/Fsxi2UhAi2G0uiJsfXPDxT/+VqHp64x2ul5k9J7+V+1wvP0xXaFTpdSpwESdJcx9yhk7oYMzl3hvjGJdkBmZLwBdzVXtOhpMf0HOBuGf7Ox7NYaglXbpUCf30eudhXfifVLCjs+e77MIEYt2HprHXP9gcLbg4CZ8eS7iss+Qa/rpZK/So3tQIfKBrXyDyv8/T6EsUQGZz1FUYJi299vxCZocZQFvPlClknVh1WyWBr+q/taHc/bziEEbQW7SYFULAcD93Yw1TIP4koalVJf+prhfNZWcFjkg+K4U96HIntWy/oxkfOxhgrvt4el4tDBNXce+jMupchdLtYou2HizH0IOn2qrjVWWZo0u+gg328oSqMG7EnJ7RPRLF9PHcB5eIx9/doJTwynwmVbVGfM+HHfLKKhL10EVVf8GSe2cFf9pjGdTr9hdI1i+j1pJ5ZK0MBh1NjUGp6I7lE63a7ABrFMuzwFtyvAkTiTpIFjtq4Nc1y74zvcfD/0hbrz6jxvDxbX5Jh+OLrq5RTCWYRHLLftCCreECRAeIVWdma40=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9e89d317-7d31-412a-ad84-08dc5b1d6c9c
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 18:21:51.5391
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: X5QWKQDzMiKHo0WbS0mXj+Y6bK3R06iB4hUFBkJM0ya5bFMMBbh8Q1XdgDJc91eq3xi5tqclUJAzfb62nCV3viIUCZ0DM6W9VOZSXjUxwXw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6500
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-04-12_14,2024-04-09_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=874 suspectscore=0
 mlxscore=0 adultscore=0 phishscore=0 bulkscore=0 spamscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2404010000 definitions=main-2404120135
X-Proofpoint-ORIG-GUID: 6RP7bwFo1oyJXyfop7EHaO4ltTXWlf2S
X-Proofpoint-GUID: 6RP7bwFo1oyJXyfop7EHaO4ltTXWlf2S

dissolve_free_huge_pages() only uses folios internally, rename it to
dissolve_free_hugetlb_folios() and change the comments which reference it.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 include/linux/hugetlb.h | 4 ++--
 mm/hugetlb.c            | 2 +-
 mm/memory_hotplug.c     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index f4191b10345d6..9ad7b97069cda 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -862,7 +862,7 @@ static inline int hstate_index(struct hstate *h)
 }
 
 extern int dissolve_free_hugetlb_folio(struct folio *folio);
-extern int dissolve_free_huge_pages(unsigned long start_pfn,
+extern int dissolve_free_hugetlb_folios(unsigned long start_pfn,
 				    unsigned long end_pfn);
 
 #ifdef CONFIG_MEMORY_FAILURE
@@ -1153,7 +1153,7 @@ static inline int dissolve_free_hugetlb_folio(struct folio *folio)
 	return 0;
 }
 
-static inline int dissolve_free_huge_pages(unsigned long start_pfn,
+static inline int dissolve_free_hugetlb_folios(unsigned long start_pfn,
 					   unsigned long end_pfn)
 {
 	return 0;
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index f6dd5f597df16..51665b20d90f9 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2472,7 +2472,7 @@ int dissolve_free_hugetlb_folio(struct folio *folio)
  * Also note that if dissolve_free_hugetlb_folio() returns with an error, all
  * free hugetlb folios that were dissolved before that error are lost.
  */
-int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn)
+int dissolve_free_hugetlb_folios(unsigned long start_pfn, unsigned long end_pfn)
 {
 	unsigned long pfn;
 	struct folio *folio;
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index b79ba36e09e03..431b1f6753c0b 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -2051,11 +2051,11 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages,
 		}
 
 		/*
-		 * Dissolve free hugepages in the memory block before doing
+		 * Dissolve free hugetlb folios in the memory block before doing
 		 * offlining actually in order to make hugetlbfs's object
 		 * counting consistent.
 		 */
-		ret = dissolve_free_huge_pages(start_pfn, end_pfn);
+		ret = dissolve_free_hugetlb_folios(start_pfn, end_pfn);
 		if (ret) {
 			reason = "failure to dissolve huge pages";
 			goto failed_removal_isolated;
-- 
2.44.0