From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4ED82286AC for ; Fri, 17 Apr 2026 03:40:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.186 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776397248; cv=none; b=mbGPSYXDs0Twtt8zRe4+YNVCUYDD4C+cgk+izHMTeOQUkmjo2GRigryr4YpVJbLkrUv84Kz7HLJbWqgZR1G4wSYkGP4l3SA8Wqa4SwaVL0aOlR1FJ4ygb/H6tvMYizA1g5kEC97JT9GxEnpiqyfgtv3/Bf51cgVNJFEr7RKI9Yw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776397248; c=relaxed/simple; bh=J/9Mdu+Ssznv1EkK/0i0DuycdjjKY3HXUT+/7qbnurM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=F/fd8QMXNY6thfFqQL4Zd7w7PHqWIcPcv7j6d6T1zcS2stTBd1fl4UMXlGHK7xZqwHExV5s8BnicBE9HWJH1CgEkpL1eIValeHqlA/z7CKxzdV+IQXph5qmUoBastHxQFIxntdb0wAlha9cKdZ8SV5ZG6NUwck+sMeVk+dJIDQg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=CWK7pZ4f; arc=none smtp.client-ip=91.218.175.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="CWK7pZ4f" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1776397245; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u7ww5x3caJvrufa945Qbb7g+cuzkYOKwE0WoRtPhhBc=; b=CWK7pZ4f7u8FQDcEqqw2AQspzGWC6HZdUHX0baE665ZMTj4JEbfYnKAP03v9atFfkr0zyJ 82TRw3h0dg0AS8Ac+g+O2y4hJHfSkerfvHhATBK1dL2RGGhLFnQWUdhH5rCAv6bPa9M5pc 9rc1srAZhQc9MMnLaHOVFg4c2JCrCzg= From: Baoquan He To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, usama.arif@linux.dev, baohua@kernel.org, chrisl@kernel.org, kasong@tencent.com, nphamcs@gmail.com, shikemeng@huaweicloud.com, youngjun.park@lge.com, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH v4 3/3] mm/swap_io.c: rename swap_writepage_* to swap_write_folio_* Date: Fri, 17 Apr 2026 11:39:51 +0800 Message-ID: <20260417033951.1111038-4-baoquan.he@linux.dev> In-Reply-To: <20260417033951.1111038-1-baoquan.he@linux.dev> References: <20260417033951.1111038-1-baoquan.he@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT All these swap_writepage_* functions handle a passed-in folio, not a page. This renaming makes them consistent with their counterpart swap_read_folio_* functions. Reviewed-by: Barry Song Reviewed-by: Nhat Pham Acked-by: Chris Li Signed-off-by: Baoquan He --- mm/swap_io.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/swap_io.c b/mm/swap_io.c index 1b054a122f53..50a16148b919 100644 --- a/mm/swap_io.c +++ b/mm/swap_io.c @@ -370,7 +370,7 @@ static void sio_write_complete(struct kiocb *iocb, long ret) mempool_free(sio, sio_pool); } -static void swap_writepage_fs(struct swap_info_struct *sis, +static void swap_write_folio_fs(struct swap_info_struct *sis, struct folio *folio, struct swap_iocb **swap_plug) { @@ -407,7 +407,7 @@ static void swap_writepage_fs(struct swap_info_struct *sis, *swap_plug = sio; } -static void swap_writepage_bdev_sync(struct swap_info_struct *sis, +static void swap_write_folio_bdev_sync(struct swap_info_struct *sis, struct folio *folio, struct swap_iocb **plug) { @@ -428,7 +428,7 @@ static void swap_writepage_bdev_sync(struct swap_info_struct *sis, __end_swap_bio_write(&bio); } -static void swap_writepage_bdev_async(struct swap_info_struct *sis, +static void swap_write_folio_bdev_async(struct swap_info_struct *sis, struct folio *folio, struct swap_iocb **plug) { @@ -590,17 +590,17 @@ static void swap_read_folio_bdev_async(struct swap_info_struct *sis, static const struct swap_ops bdev_fs_swap_ops = { .read_folio = swap_read_folio_fs, - .write_folio = swap_writepage_fs, + .write_folio = swap_write_folio_fs, }; static const struct swap_ops bdev_sync_swap_ops = { .read_folio = swap_read_folio_bdev_sync, - .write_folio = swap_writepage_bdev_sync, + .write_folio = swap_write_folio_bdev_sync, }; static const struct swap_ops bdev_async_swap_ops = { .read_folio = swap_read_folio_bdev_async, - .write_folio = swap_writepage_bdev_async, + .write_folio = swap_write_folio_bdev_async, }; int init_swap_ops(struct swap_info_struct *sis) -- 2.52.0