From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.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 AEB0C367299 for ; Tue, 12 May 2026 10:42:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.188 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778582553; cv=none; b=aNEyUFXlAlhy1IaOyofQ7RrAz6jrjx2gLthcQOJheMa6/xFegQWJCAf3HOjWHEfvTZhcTtAuUKCAzW3VO3sChUP5+TL07NFJFspfYMsgTUfhXy9aPJkp1Pw2z8fdUiA29NRuDaT6K+zjt0sksvOwzSt8BMBkRu62yUjrXaP9dpA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778582553; c=relaxed/simple; bh=Ia6yRnx4GQ04MIqhfc6XCj9gqT2/2tXlhWFT2O1vPsw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=UOaX4H80UNtEbnpjT2PDxDwz0hEZ8OMxcXEvQlZZRl/2UyJyl2hMW2sYkupX54s0YH55pwwBvvKBGcTctEaWOWuldmHV5Pdf3ifUlBQJLrFMO7wuNwM5iwCwZv5vj/+ujMpD4D3aEG6loeB+ktVSJcJtiInS3/Al9XheneulBQY= 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=Jg7op6ym; arc=none smtp.client-ip=95.215.58.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="Jg7op6ym" 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=1778582549; 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=C4MCpeC/QI7aHjdJ7R96J+Wf7v/xQ/HqdMKtbliXTYQ=; b=Jg7op6ymUQq7eSQlbqukgQm4a8WnNw1RxBKdasWeQORHEXNOyuW/B6ETDbrlFy24vk73V6 2mrWF4l8/DeYIBmM8PUqo1q7je2X/p+6Qtnb6UaO42x3PSGkYJkm7VdkaIjM74qW41e82I 0J6WqNbjp08P5vuohUNLqkG+kV7f/m0= From: Baoquan He To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, chrisl@kernel.org, usama.arif@linux.dev, baohua@kernel.org, kasong@tencent.com, nphamcs@gmail.com, shikemeng@huaweicloud.com, youngjun.park@lge.com, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH v6 3/3] mm/swap_io.c: rename swap_writepage_* to swap_write_folio_* Date: Tue, 12 May 2026 18:42:01 +0800 Message-ID: <20260512104201.716213-4-baoquan.he@linux.dev> In-Reply-To: <20260512104201.716213-1-baoquan.he@linux.dev> References: <20260512104201.716213-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 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 3f9aee5b6a4d..ff38adfde0fa 100644 --- a/mm/swap_io.c +++ b/mm/swap_io.c @@ -374,7 +374,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) { @@ -411,7 +411,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) { @@ -432,7 +432,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) { @@ -594,17 +594,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