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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 718D8C4345F for ; Thu, 2 May 2024 08:47:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0ED26B0083; Thu, 2 May 2024 04:47:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EBE336B0085; Thu, 2 May 2024 04:47:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D10AE6B0087; Thu, 2 May 2024 04:47:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B4CC06B0083 for ; Thu, 2 May 2024 04:47:20 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6B3111A07F5 for ; Thu, 2 May 2024 08:47:20 +0000 (UTC) X-FDA: 82072826640.02.D2984C6 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by imf05.hostedemail.com (Postfix) with ESMTP id C45DC100016 for ; Thu, 2 May 2024 08:47:17 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=V9ICqMUi; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf05.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.215.171 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714639637; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WSvD/YVvY3oR/SV9lrJcxmGa9WfASg1z+eMVQdwymCU=; b=XOA7+0tIMhIT9I3ZNwPkyMQ7BfsFu0OjldZ6nlvEPnhLAgeAKykxKe/lzdphI9cDJgt99m HCwa3Z99oMYzQTmfP25vyqmZP7SdQuTIY2mRp2bD0tnyHQn0FvQ4+RTlFyTB4vzTMC3J7d 3avv/l9NUruqjBR3rDvOGpA5MavGVZ4= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=V9ICqMUi; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf05.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.215.171 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714639637; a=rsa-sha256; cv=none; b=OIYzDlN4WaY2j/38+dw0VlJm6tclZpdSjMrjf+9E64Q44/jYWL24OuhOOnh7drsf+wfl9w Q5RW/l3Drvbt5yx01ku4mvOtkTMQC19OtoBSEmwiLaZCqOhN8uZ015kNHmSrCHj/Dnxg/N bPG80cl9tx6CPTI6SFwPsaKWmLIVM4M= Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-5bdbe2de25fso5833301a12.3 for ; Thu, 02 May 2024 01:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714639636; x=1715244436; darn=kvack.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=V9ICqMUizcWR1ePI6JpB4K85Yx9gKWVsSG6e/DM5kpbQwMDQGO58ePAG9DBSWniJrf jfz+HNcFEqZIz015fRWz0fOUqeiuvlGr4hm5lYlKYbTbNovHi35EMGqz2q1pMt54qyCn 9fpJCQLqM06r1yda0eDkNWb2Px7oHpWoA+6s3n1mMDqg83ow+mp3FCiNcjbhwibkq95I Gxbr+XjulVsSqpTA33mtcDp1E3X4XYSIO3g/uJykIl6aMZNbIPbV/vbrKPuhQKcXcP9W JXLHvmoHQNnShVaV+SLiIe9dUbyRHgQMrKM5IuRP5iq0CHj4Uado8ITyyTGQBj3skMfN F5Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714639636; x=1715244436; 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=Gt0Js3HJOW8QXzRegmmQ752SilEIK1qg5F7SoGVru9N9mTRmGvJJnxG7pFZuEgYul+ iPK+G+mxx7kMEjfQ43Xj/eSJjf7JVnERQ+/NW6sTzfoO5Ksn79YcKY5EYRuOsmbDTUPs VGi97PmtIM4dd2uazh1yaCdwAsswugY7l14P7osc9i/TYmiGKI2xSYmp7E2YIHZzXeFB VoWAJ7evUOUMbpSiHHLTJ8O7LQv4AX1UVYpSxQTezXCPHbxJZ8hHUpnyPu16/dzPabNw /cD2Y9vi4VFP++uIeDQdPynu0xEFx8Ml466XrZGNjWp63HFBzsiyr+CMIeNU6IeWCAf5 6Bkw== X-Gm-Message-State: AOJu0Ywvse66wtVl24fkAWGxZqdCiqBTVEmhoENAjXJeORTa9feJgdLs do5dLscRg+j3re7GsHQ4Ndd+yfMMYbdJx00iuuW1nU8Ku6KySYiacsegUC6gSBs= X-Google-Smtp-Source: AGHT+IHHmKPYxmQ1NnctSOq7P493kmk6LeLXH7PC/dx0NjjiKoIYGnc+kgONRssyDz3JCfG5GAiMeg== X-Received: by 2002:a17:90b:50cc:b0:2ad:da23:da0b with SMTP id sb12-20020a17090b50cc00b002adda23da0bmr5630235pjb.34.1714639636249; Thu, 02 May 2024 01:47:16 -0700 (PDT) Received: from KASONG-MB2.tencent.com ([1.203.116.31]) by smtp.gmail.com with ESMTPSA id q6-20020a17090a938600b002b273cbbdf1sm686805pjo.49.2024.05.02.01.47.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 May 2024 01:47:15 -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 v4 01/12] f2fs: drop usage of page_index Date: Thu, 2 May 2024 16:45:58 +0800 Message-ID: <20240502084609.28376-2-ryncsn@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240502084609.28376-1-ryncsn@gmail.com> References: <20240502084609.28376-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: mcfx6x7y3x4ru4rzsxrzsd7m1hqj5zoq X-Rspamd-Queue-Id: C45DC100016 X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1714639637-285049 X-HE-Meta: U2FsdGVkX1+UwZLfbz2Rk8UtbPX88+IdgB/6KRRTWPsW1npzP6OfydtJXOF+5meQ4HK1F7EmdnDwfODLvRBNaIj7NMi8MzErqqWwlzoNf8E4hkEkF3aFL3Ud8f5cRb192A4CeRjVBUmKPtaXc4SxYzEJcPhLAyYCKA5zduHuHB8F8nnbdA+mAKA2Sb3+A/bNr15zpmn4Tjo8U6mL54SsLwo6JJ9AnnA4+9cTWs9ZwKPBF2CztQBK78SmU0XyGUG13Hs4ZjHSOwXDHGbYPTLq7u1YZQArFrPi4MyToAE2mXi73s26Ll9sAMgwIEZvSSZtBgbpSSQe1ov7i7XE611IeYukKNKJwxQwGcU/8q7oVQFSH77EHpKCKN4La/PkuY8nmQLGMl8aYtc5w4WR6w1VWxZHtzhB/IViP6q8fGBflrE4JpOrTggnxS4IJH5kxuIlERI+efCHQC6/3ljG8CwQDH6g5dYJAIVK/9hbX35rjkm70KjvYBY1iPkcf/ojr+PVBY+vtwaWxB/mt/Y3MO4Z6tEKHxXsOAFS/Gr45M5WWFWlg6DqwwTvEpqI6AajBz0e5qC17Iicgojk0SiN6nnR89Qz7gJ7WdlZRzhLeSLL211zlOpWxkWcu/yZzrivAvVGvriHjZSS6+BMwnPQbTCTxM556FqIe2+qo1UJEVKSTrb6JZsyMFEPbXmzi+W88+9/Bch0+MzFu1wNwBgx9nly9ibCwWP1AO7frZv4GUXbjKY3xmP3kZSsz5vLXtZ3IxfL8VgiDnECiIzwQY8emgyeZQPlYgNp4dkHZixtF4qdeQ7fnu6LiZ/EoJIv1/jihvsL296gC1TEEs+GaBqKp6KE6mFcQ28E1h/NDajG6LGpZaL8oT20kSwx6o5D4uWTtHm/piatdIusHFYiViTbWHasdCdVGD8wuohd4RQS5k2YkIdUn/RY5Y9gqhB+9nej3/qoHiG4rJcAmR1SfKCNhDk A6DExxN/ hutOXza3YV3U6iRpNorgv1r5xF0FZpLJ0SGVZrKu9bfAsVLiphpzaIEC3l79sgt+Xm8Ynl95yuH3XeuXj+y2qdzsK14kcle4ji5eMucBvYbv8UxLw0MW/E4uicbIHBYnZ9l9mqllbD6p9pKlnpxJRuNDBfIj8btYhCHg5ybXpyD3OhpST0C2X9ff/R6mRG6c0YVx6R3o0e//fYZVl7o6jEISSedFr8xXhh0Umxw0xuhpCXpv1OpFC/ZpCOHIwoMD1ebthvM1KatAs+QjU4jwkc/yao0hdig7wmw6Raxb+vmyNmu9ct5ugez4SyQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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