From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) (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 40A203D5230 for ; Wed, 15 Apr 2026 08:57:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.188 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776243455; cv=none; b=fXn3WuOYcTTW7+KG/NwpRNsd6y++XMO26yZ9p+QUPCVszuA5zaQhRiBiD8oQzU7RubDHMk9aM/pyZrRwd19yXzU8og715J2Q+T/MwzRldsLlzU3UEPbELWHFNgaAX2lQIC9dyO2eVTnyZWHwxHoeMTuSuIkmfq3TT+qN2z2HQQU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776243455; c=relaxed/simple; bh=q67G54qk/ovmGllijXHuA7HNjQmD+TB8Wil8Oph7/AA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=dsMgrPFMVdPbyXNbDwvvue/GD0N8lnXxII8dFFuXbG2ER7xbyMyU8360bHjD/BZYi5rK6REJyYeAwt3jUFeNjsTJRJ35v6KiTTSl83xzquzjYfSXB9+rXPV2knuadvwC9Vad0uDUrRowoGJQiTPNFMt8cNsx/uPyn2Ud1Fgm/lw= 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=Go0uIRa0; arc=none smtp.client-ip=91.218.175.188 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="Go0uIRa0" 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=1776243451; 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=h8Q0yOP/JuEDCBeOqlI6zUOjJoYjm2ZTHveOpWLQl2Y=; b=Go0uIRa0WQa6Da4Qp3/MoP9lCX3U5mklASq9YslPWrDFn/d9iDJo4NhxNlFjRB+30WBBDv gqaqbBszsDtuln0CRDTs+C0NHE+ki4TKXWoaQf+lOXcMR+bFDgjN1JuRYL++ZAJWm8wM8k pW39m+Q0K+QqAPxTov2GkfHBZAjvJcE= From: Baoquan He To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, 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 v3 3/3] mm/swap_io.c: rename swap_writepage_* to swap_write_folio_* Date: Wed, 15 Apr 2026 16:56:58 +0800 Message-ID: <20260415085658.993859-4-baoquan.he@linux.dev> In-Reply-To: <20260415085658.993859-1-baoquan.he@linux.dev> References: <20260415085658.993859-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 are hanlding passed in folio, but not page. And this renaming make them consistent with the their counterpart swap_read_folio_* functions. Reviewed-by: Barry Song Reviewed-by: Nhat Pham 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 602e9b871b30..26f2daabb91f 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