From mboxrd@z Thu Jan 1 00:00:00 1970 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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E0369C4345F for ; Mon, 29 Apr 2024 19:07:04 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1s1WL9-0004bq-E6; Mon, 29 Apr 2024 19:07:04 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1s1WL8-0004bf-63 for linux-f2fs-devel@lists.sourceforge.net; Mon, 29 Apr 2024 19:07:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Reply-To: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Content-Type :Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WSvD/YVvY3oR/SV9lrJcxmGa9WfASg1z+eMVQdwymCU=; b=fPoHBsV2VINprDyaLluUmBjPvV IA4Yd6Hxwn5ek4ugjWbcWQ9nRzkBhlbUEPzV06pNhXkuBEr0HvIfuG/cJ8Ren7ovIGeGji8EN1Sz7 Wbix6JT37A0rdpDwudbCYaAq1J36jbSuFE7spDc2GeilWp6qdxt7Kx/z2T1MVGZNR/Fc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Reply-To:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=WSvD/YVvY3oR/SV9lrJcxmGa9WfASg1z+eMVQdwymCU=; b=Z0uzGz4gSHf4SpgEVzyuNvprd1 VB8xcRUvl9xJCobAi6mAOxffiF40f26ZnteFYuo09Djy7YycF/rybYY0WRdh4J5SeU4lJqP+lo2AW lAXaZBVpObbCZ7jzwGI4QVLPg4q5P5w/5S5IvfVAvdTIuSun+Nv7OeDqbu2ukE/iFcjs=; Received: from mail-pl1-f171.google.com ([209.85.214.171]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1s1WL7-0001Xz-Ol for linux-f2fs-devel@lists.sourceforge.net; Mon, 29 Apr 2024 19:07:02 +0000 Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1e834159f40so38879785ad.2 for ; Mon, 29 Apr 2024 12:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714417611; x=1715022411; darn=lists.sourceforge.net; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=WSvD/YVvY3oR/SV9lrJcxmGa9WfASg1z+eMVQdwymCU=; b=Th/8zl22hjiIk4/KYhZpLCWXYwUCocfOKIObPPVK2t/I60mSWeNyEBFPtPPZaiu4A4 gGMs2SLC8qAtCCen31CgD9whTRqOIDXzXLxtGpq5rl3sgRi4GS6ldsBtFTpX7iV2MDBv skDA3zwPCbSbahbTxUDfbbnCYpUlJBc4TIaZqfgiHT7Iqk634BCCxa95xIX4aAZvNU3U Wp8GZJsslDwKsZYc6TAKK7jgoMr/OoqlZq2IiRMSZQl/cpFDDe3UCNiqSxcPLS4LwWKw 3BwPEkVr6tSHBS0PQuaizdcyy2WcKhZjZEP92NBTNq8vkGFdfaUqkNKuX+edrj4EI3c1 uzIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714417611; x=1715022411; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=WSvD/YVvY3oR/SV9lrJcxmGa9WfASg1z+eMVQdwymCU=; b=TPCcr4nOyJVcKUeNr72DVIqr5DA/qT/okZSlzIyT1Oj7Pv84gku0YXHTwm075SlSoc e9QKS6l69UNrG0tzFWXlzwj+fNFw5ylVtCV7+Eih/1qSGdS+EHtH4jKnksFRBRMnUQKK lcJvDgi6EI/nEsHy4mP/Z4eZ7j5gyd8aqkuLHq1kx3Kx///jKezKr0qRN9C+DK8ZZFbf s2xCy4J8cAKbTMzyj5qY6CZ0QpULmidWA2LmFeK82ur+sKRVBTzBpOMRP1++2kh5uiDf hjNK3sdoeLtd89dXjmH7U2tCgdQ58rjsmr4xMwZbAumSqCgGan33WxKJRmVMS1F//zj6 cUpA== X-Forwarded-Encrypted: i=1; AJvYcCWsG6Rnpn5L/bM5k37XZJNaWrFwdW2K3JjwVqTQnf2bDCDIRF2PjG7ZGVKE4mPDn3CAlyu/E7vkNVLNA+Tujuj9HyVCWwXaQx1t+xO3fLpQutuak/c+iQ== X-Gm-Message-State: AOJu0YydpaZRQBPugNalX0TeFbE+f+SkMMHrP0hibyrfxQmVBkEu5O4B BhAuTBaZ7mJ4WeXqTiRIfXisNffO2iCn6LE8OP9HoqaPdvNT3JWO X-Google-Smtp-Source: AGHT+IEWWyXjXq5qxQK4Wj2h+dXwYC3HBxH2tY9g+B+mmj2ONuL2mZBA9D6pxjlnJqOR4++MfTCr9w== X-Received: by 2002:a17:903:1249:b0:1e4:b1eb:7dee with SMTP id u9-20020a170903124900b001e4b1eb7deemr13466540plh.47.1714417611389; Mon, 29 Apr 2024 12:06:51 -0700 (PDT) Received: from KASONG-MB2.tencent.com ([1.203.116.31]) by smtp.gmail.com with ESMTPSA id y4-20020a170902864400b001e49428f313sm20619356plt.261.2024.04.29.12.06.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Apr 2024 12:06:51 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Date: Tue, 30 Apr 2024 03:04:49 +0800 Message-ID: <20240429190500.30979-2-ryncsn@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240429190500.30979-1-ryncsn@gmail.com> References: <20240429190500.30979-1-ryncsn@gmail.com> MIME-Version: 1.0 X-Headers-End: 1s1WL7-0001Xz-Ol Subject: [f2fs-dev] [PATCH v3 01/12] f2fs: drop usage of page_index X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Kairui Song Cc: Kairui Song , Ryan Roberts , Chris Li , Neil Brown , David Hildenbrand , Hugh Dickins , linux-kernel@vger.kernel.org, Matthew Wilcox , linux-f2fs-devel@lists.sourceforge.net, Yosry Ahmed , Minchan Kim , Barry Song , "Huang, Ying" , linux-fsdevel@vger.kernel.org, Jaegeuk Kim , Andrew Morton Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Kairui Song page_index is needed for mixed usage of page cache and swap cache, for pure page cache usage, the caller can just use page->index instead. It can't be a swap cache page here, so just drop it. [ This commit will not be needed once f2fs converted f2fs_mpage_readpages() to use folio] Signed-off-by: Kairui Song Cc: Chao Yu Cc: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net --- fs/f2fs/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 961e6ff77c72..c0e1459702e6 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2057,7 +2057,7 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, sector_t block_nr; int ret = 0; - block_in_file = (sector_t)page_index(page); + block_in_file = (sector_t)page->index; last_block = block_in_file + nr_pages; last_block_in_file = bytes_to_blks(inode, f2fs_readpage_limit(inode) + blocksize - 1); -- 2.44.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B56E13B292; Mon, 29 Apr 2024 19:06:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714417613; cv=none; b=Q82980/6epVuwscASfxjnpkm2OMjs+1AYy4y15Cwz3pmlDSzdmbepRIzVaLUH0Hvo5dNz7NpEV9jPw9mIgbyeCv7rV651o4NQT4evoJZGctzrbU/yCewDMEiH4VoonVAJqnCHoaITP98qMue99gVlB7PUhNLTJlJ9nYAIZk3RIA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714417613; c=relaxed/simple; bh=hDlPxTRmPzQHkSl/lYkJK+GDIbLDQq8I/dn2VuGCZ+Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lghgKr5FMYBqjIovdlWnysxFc8QeOE67RjdVgIHfJJIV3Gp2MD3RkaBbh9Za6sr8zdPyHGF7BTNqPEatiLV5e+xDwnlDLaT1pq0OLx1W5cv8dJVJdy64N5kbXjugIGPDDLUNV2PH0X2SJoOb4MPc0ygTOuPPSgkVKDP1mAHxTio= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aXZIHhLr; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aXZIHhLr" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1eab16c8d83so38643555ad.3; Mon, 29 Apr 2024 12:06:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714417611; x=1715022411; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=WSvD/YVvY3oR/SV9lrJcxmGa9WfASg1z+eMVQdwymCU=; b=aXZIHhLrZeNyFWhKGu/8Mw804jf9yqvaXYPvKV7DwUfDeCsQe7GJWrbKK1JbsKi6ds ePz9vhvNr2Q+Q5jgKrjlOPyEXM6uSECUfIbYteeWbM9E6eu1XuU6S9QMAp2ypF4SHFun UbfvgO3EBtNgy8/UdXGhoGA6GtiBA+TgesXCqwlCXNuFT1yeKsaGwGAGIFOXhgWyQXo0 g/tOcxstKUVTYKIeceAfI7V7BNbBstfoLkHDP9mULKG3vKdmfVrBN9m7Hm2tJa9osM5w 6y8WAcY62czY7C/VqfYUndSCLlhZfIIZzUsQgE5o7gwR0z4ktMPUBasarXMUQnFoV0Hh gWVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714417611; x=1715022411; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=WSvD/YVvY3oR/SV9lrJcxmGa9WfASg1z+eMVQdwymCU=; b=NJwoYoRjqTjXkkzYE0NbKmF+K58Z3wXG+DUo25atu6GbMWTjFs4rs+9UmWkym3r14i kHs6RygAstL03m8EShW+fiQINaH/Nt9XoM+vs4rYt0DsVsgRsLkcpZcDrXJiDEL4SinE 7gDs1comHV0QPe6yjGG3hcMGkBW6toYC107b2vMqHE5U6RFS97pLK3WqhBFoi42uTvXo M3aQMOgh4r03hhBpSpbz7nADK5s6d0EVrFgan672YDI73OdGHLYGdN+9DiNezDCX2F2v f/lh7p5PoucS49dMWPKCK+bRjBn4zWH/exqy9nbyJUQgpZ34+6qkbF3uHYg6z83VQ1kl SpFA== X-Forwarded-Encrypted: i=1; AJvYcCUkXNr0WfkrGDd/iPlzf96SmPOY+yZ7QRpRj7W2/vuO6Yex6lFFSTrZjpYVaMrwycJA2XVVQbQm/7yYWo47FKmKs4vgNQEsq88dxSSDgpusLg3N8EAJiZycUgyiRDc+NCzl5n7URUC/mM7xVA== X-Gm-Message-State: AOJu0YyKojKu1ucJnoOOJM5bjTkQHvSJ+TloikBPRqQqqnE9l4R17RLq jjggpa+oRaPZVN70rYqHKg5+GJCagiNNrHaT72lCUU3Y9VfbAhD5 X-Google-Smtp-Source: AGHT+IEWWyXjXq5qxQK4Wj2h+dXwYC3HBxH2tY9g+B+mmj2ONuL2mZBA9D6pxjlnJqOR4++MfTCr9w== X-Received: by 2002:a17:903:1249:b0:1e4:b1eb:7dee with SMTP id u9-20020a170903124900b001e4b1eb7deemr13466540plh.47.1714417611389; Mon, 29 Apr 2024 12:06:51 -0700 (PDT) Received: from KASONG-MB2.tencent.com ([1.203.116.31]) by smtp.gmail.com with ESMTPSA id y4-20020a170902864400b001e49428f313sm20619356plt.261.2024.04.29.12.06.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Apr 2024 12:06:51 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , "Huang, Ying" , Matthew Wilcox , Chris Li , Barry Song , Ryan Roberts , Neil Brown , Minchan Kim , Hugh Dickins , David Hildenbrand , Yosry Ahmed , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Kairui Song , Chao Yu , Jaegeuk Kim , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH v3 01/12] f2fs: drop usage of page_index Date: Tue, 30 Apr 2024 03:04:49 +0800 Message-ID: <20240429190500.30979-2-ryncsn@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240429190500.30979-1-ryncsn@gmail.com> References: <20240429190500.30979-1-ryncsn@gmail.com> Reply-To: Kairui Song Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Kairui Song page_index is needed for mixed usage of page cache and swap cache, for pure page cache usage, the caller can just use page->index instead. It can't be a swap cache page here, so just drop it. [ This commit will not be needed once f2fs converted f2fs_mpage_readpages() to use folio] Signed-off-by: Kairui Song Cc: Chao Yu Cc: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net --- fs/f2fs/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 961e6ff77c72..c0e1459702e6 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2057,7 +2057,7 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, sector_t block_nr; int ret = 0; - block_in_file = (sector_t)page_index(page); + block_in_file = (sector_t)page->index; last_block = block_in_file + nr_pages; last_block_in_file = bytes_to_blks(inode, f2fs_readpage_limit(inode) + blocksize - 1); -- 2.44.0