From patchwork Mon Apr 29 19:11:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kairui Song X-Patchwork-Id: 13647561 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 F0645C4345F for ; Mon, 29 Apr 2024 19:11:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 863C06B009C; Mon, 29 Apr 2024 15:11:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 812F66B009D; Mon, 29 Apr 2024 15:11:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C75E6B009E; Mon, 29 Apr 2024 15:11:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4B9F36B009C for ; Mon, 29 Apr 2024 15:11:56 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id ECBB3120122 for ; Mon, 29 Apr 2024 19:11:55 +0000 (UTC) X-FDA: 82063514190.15.34576E7 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf24.hostedemail.com (Postfix) with ESMTP id 51FA218001D for ; Mon, 29 Apr 2024 19:11:54 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=chTAOcak; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.174 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=1714417914; 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=/1bORWOEMtQqR5EeJUVgL0AX3aI0603PhY0Dzu9DVzE=; b=dZiQQcMQxn1vag+CeIYOXx/TRdSi32VwHIoA84asXJ6X0Ivkp1QBsvlX0ya/7SRZGSGdpE 9J3QegsVDfLHFnY/lH6a3hGjs4fgA0g16t++qU7/CcNZGKDTjmpAo6qteE4wThIG6Rryt5 sqJSBcmViB+IU1+hOft/F3AHIMnXmN8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=chTAOcak; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.174 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714417914; a=rsa-sha256; cv=none; b=HWi2307C0YjKobdtjcGmLJTlvNpJ3jaeXACYBuKGE4RAGS8kFzBlco+AovJAjjx4mLO3r8 2A0xKL0fy9M080a8THoV+Csv/2TE5wQ2Wde0iTzsaSlgEfLGaB3C2odP964SDdC0YzvvL5 08gr0QV/ULEg4RjMfrZQ5UUrYFGILJI= Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6f0b9f943cbso4028556b3a.0 for ; Mon, 29 Apr 2024 12:11:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714417912; x=1715022712; 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=/1bORWOEMtQqR5EeJUVgL0AX3aI0603PhY0Dzu9DVzE=; b=chTAOcakKSyLRN9wU8CKjPyPor5Hzl/tEyE0mvxLMYpr0kxUZBKLKQz07JJZZY8lvm R+fMJCJ6poZmyprOlZPRjAX/BDXcV/XQE6UDAWcXCMxEGWqzpstP9xNogdlJIC/5UaXr v/WnXpy6SSsU81VHWpXlbb9drnTnLQfsrKarfSWP6HEhMoc0lNNQtpci9EtoFHAopvbq 0HAacXrlGdsGTq0YOnMbLj97UU0nH4RvwxWkI2+LyKh8gOBfqNDB4tMUlLqlHZWIxM+H 6JZtGpB0r1ouxt6wRyyW5BiekU3r+fzbEtRgpb1IlkCIH82diUc6/6q/neid1Nr69qRV vpnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714417912; x=1715022712; 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=/1bORWOEMtQqR5EeJUVgL0AX3aI0603PhY0Dzu9DVzE=; b=M+TIEPTOCnQnlxSix0ILz7KTbM3hugtnZb7HTz53aoi1oH6ggaOW+9Du7NQQieNvSO sqVooTCuu3VIkVAPMTFMEMSkKGySoUzrt762/54GDYm5rWCD4noQmqqXMkkW1NaJaTiq 6MnBlfQ8hLCdmidA0T0QBM7sM0qDbxj7I9LyY6uZqceF99xUcucAlUquLCjABgRrP40I 9aAPh8/vaF2r1uFopjBhowhPnOr99nv70g9iniy8xMhvpdrLJeRXRDBdtplLBbTC7RVo l1q192IV6ITWJ4rYt5oCNX/fjD/nLaLjz108c6H37YxTXzc+ndBii7R/Q2Gct6Uiym9v zJ8g== X-Gm-Message-State: AOJu0YzwzTljOSELjjBbfHspNC1Q4JNZSEQF5QFb8+WWViemZIWk8l7h Fac9KlIKS6v9hVqKnhQ+31MuP0MYDK7QDrJVCtcafcGf+exzsZxTCW81gQG/woc= X-Google-Smtp-Source: AGHT+IGx8aY8FR50gdhXj18Vz7j7jddJ8qW0aYfCyeOPPSYXuiUjoJ/c7FOQYDIpxGDCtkTEqeM7Ww== X-Received: by 2002:a05:6a00:2186:b0:6ed:cd4c:cc11 with SMTP id h6-20020a056a00218600b006edcd4ccc11mr431263pfi.25.1714417912024; Mon, 29 Apr 2024 12:11:52 -0700 (PDT) Received: from KASONG-MB2.tencent.com ([1.203.116.31]) by smtp.gmail.com with ESMTPSA id e10-20020aa7980a000000b006ed38291aebsm20307988pfl.178.2024.04.29.12.11.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Apr 2024 12:11: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 Subject: [PATCH v3 08/12] nfs: drop usage of folio_file_pos Date: Tue, 30 Apr 2024 03:11:34 +0800 Message-ID: <20240429191138.34123-1-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 MIME-Version: 1.0 X-Stat-Signature: x4wehoarykjzj8ygtnp351ugwtxgeywu X-Rspamd-Queue-Id: 51FA218001D X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1714417914-379546 X-HE-Meta: U2FsdGVkX19HCMB1ROhjjkilHXnpC7flY7Ps469oMbz78mZWxzLPNazJknfcSsL4Si/ngDl2zviG4XF+DFxTI2NWCIB/7VFPX8AIfUPlZZilm25K50sgiznfNdgHkivMxuHgfg6OTCSP59MOT6rs8BaM82SVntfSko/nJLmRTYi8gQRIGiWJ+rLrIYqYawSNEZtxxKAwaG+vy7VsD9D65/R1Tp/5Zdp8H7Evlq2PtSnFLYxXjCQ+E16nlBj4GG05osRXiTEu7xRBehngrMW0LZ7jMbH/tw5EjiY6QwUj242KqvaGtibMrbNEfzrjmZ3zXfPebnZrKxE5A7Vo5AX6dpJEwXvlJO92FvMhCmaA5z2Q7V8UiOxYP2z5vD4g2cXjPAzyqP5Mc+FiJmn1SXxQeDeZgVO1O2NppVvMeQqxedveGIiEU0thb+c1BR8RYYF8WQvQfapmblMxUeaIA5GsynWaBD3KxbVTvNw2jsiCdEOBwduveO0P21qTO2L1gxsAGl3yESITGj8xs5LjeRa7KEBLCcL3bxsYEdHp1rSrjcwWrNxl08aTFwapNwzUMwIuHqPO324W9O/8orRff+4n4PZrczPAiatYJgUPNPBA6F2ylsrKjgPrYB41sRndFUlCyTxzUBs7jGnfToUzjL6LXlnR28hQoYP7Mfv1iloWNL6Z9T0dAZIvhLWuBZt6fxQA/HnuVzFSVYLDJJyC+QbTlWBIOMEbA2qM4eVs5xHtxIgzcnupcb8ppVkfP+HdauIHMrr801arzQDia8TA74xIww0jwke+TuTuvCSu5Qxmibqq3BzkLrQESmI/OCW+CYuBxYHzTaXgJrEhGBjDi5sLcfM/IXDTjRDovlWrui9kBMi9bOTw60onDyegFgTjE4HK1FQxeD59RHWdjl2npT6CJykCFi/NAhFSVNwjSujgOp5hi4r4zv/Y90Tc4RIqeeY1Q6EHk3JGVv2jI3xBuJV 1aby0cNc 9+iaUT2Kuzk2I1CsJBUk0+OgGS03gyRhI5u9g+wp3FomgLd9216+FFYrymZBM7bPjMN8iMYJwPAm1oT+jStQjARJQwotPX9hH7zgNxHc5T2hPUmHo3lHnuxVyxli9g9Jr4WQ8fOT2jI/tQ7irbOrDd6IsG9c+Ifbsp77sM7zhnwYdMVp/1YsODQBQHRjTgQCsdDef8QROoSkvUAFh64J6vvV7Jl0vLgzi1QpmtgnQMYgh+sZfsiw33YMoTShpWlAvGr2TV6NimqAsyqZ50PVgMqlPgYYliK/bEZMMFR04jkhVoRPx6Jmi66Jidg== 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 folio_file_pos is only needed for mixed usage of page cache and swap cache, for pure page cache usage, the caller can just use folio_pos instead. After commit e1209d3a7a67 ("mm: introduce ->swap_rw and use it for reads from SWP_FS_OPS swap-space"), swap cache is never exposed to nfs and it can't be a swap cache page here, so just drop it and use folio_pos instead. Signed-off-by: Kairui Song --- fs/nfs/file.c | 2 +- fs/nfs/nfstrace.h | 4 ++-- fs/nfs/write.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 407c6e15afe2..02741c32e114 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -588,7 +588,7 @@ static vm_fault_t nfs_vm_page_mkwrite(struct vm_fault *vmf) dfprintk(PAGECACHE, "NFS: vm_page_mkwrite(%pD2(%lu), offset %lld)\n", filp, filp->f_mapping->host->i_ino, - (long long)folio_file_pos(folio)); + (long long)folio_pos(folio)); sb_start_pagefault(inode->i_sb); diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h index afedb449b54f..d249741452e1 100644 --- a/fs/nfs/nfstrace.h +++ b/fs/nfs/nfstrace.h @@ -960,7 +960,7 @@ DECLARE_EVENT_CLASS(nfs_folio_event, __entry->fileid = nfsi->fileid; __entry->fhandle = nfs_fhandle_hash(&nfsi->fh); __entry->version = inode_peek_iversion_raw(inode); - __entry->offset = folio_file_pos(folio); + __entry->offset = folio_pos(folio); __entry->count = nfs_folio_length(folio); ), @@ -1008,7 +1008,7 @@ DECLARE_EVENT_CLASS(nfs_folio_event_done, __entry->fileid = nfsi->fileid; __entry->fhandle = nfs_fhandle_hash(&nfsi->fh); __entry->version = inode_peek_iversion_raw(inode); - __entry->offset = folio_file_pos(folio); + __entry->offset = folio_pos(folio); __entry->count = nfs_folio_length(folio); __entry->ret = ret; ), diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 5de85d725fb9..fc782d889449 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -281,7 +281,7 @@ static void nfs_grow_file(struct folio *folio, unsigned int offset, end_index = ((i_size - 1) >> folio_shift(folio)) << folio_order(folio); if (i_size > 0 && folio_index(folio) < end_index) goto out; - end = folio_file_pos(folio) + (loff_t)offset + (loff_t)count; + end = folio_pos(folio) + (loff_t)offset + (loff_t)count; if (i_size >= end) goto out; trace_nfs_size_grow(inode, end); @@ -1362,7 +1362,7 @@ int nfs_update_folio(struct file *file, struct folio *folio, nfs_inc_stats(inode, NFSIOS_VFSUPDATEPAGE); dprintk("NFS: nfs_update_folio(%pD2 %d@%lld)\n", file, count, - (long long)(folio_file_pos(folio) + offset)); + (long long)(folio_pos(folio) + offset)); if (!count) goto out; @@ -2073,7 +2073,7 @@ int nfs_wb_folio_cancel(struct inode *inode, struct folio *folio) */ int nfs_wb_folio(struct inode *inode, struct folio *folio) { - loff_t range_start = folio_file_pos(folio); + loff_t range_start = folio_pos(folio); loff_t range_end = range_start + (loff_t)folio_size(folio) - 1; struct writeback_control wbc = { .sync_mode = WB_SYNC_ALL,