From patchwork Thu May 2 08:46:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kairui Song X-Patchwork-Id: 13651431 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 D1A64C4345F for ; Thu, 2 May 2024 08:47:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E6526B0092; Thu, 2 May 2024 04:47:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 594C36B0093; Thu, 2 May 2024 04:47:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 45F3C6B0095; Thu, 2 May 2024 04:47:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2650B6B0092 for ; Thu, 2 May 2024 04:47:34 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D62DF140D6E for ; Thu, 2 May 2024 08:47:33 +0000 (UTC) X-FDA: 82072827186.22.87ADA78 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by imf26.hostedemail.com (Postfix) with ESMTP id 04B42140007 for ; Thu, 2 May 2024 08:47:31 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=BOdA4Qyq; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf26.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.216.51 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=1714639652; 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=BixicrujN2w/NN7W8Yk1bOtYDD16jf87ysiCrI+mjZw=; b=YrQE3+DhLg1HJqHRIfUWdmmsVYikvvRe82fU53DvLFRtFPiHGHa6Uv+86x8WbGqscIcpIB yLqfMJioy+rjV+M9rPMLbpLUsrkUT+Sn+5/NrtcMMyfduS2JrOdsP2Y3O/FwKxGt6yY3Am RIvlAu1lvFjfDk2FVV+DVY+gGanjX/I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714639652; a=rsa-sha256; cv=none; b=GyI19KX39tALXsi+MmSgnn0EExo933tOX9UGAO5ipi607tu9MXA96WLzWsC9QyZUhr6Ant XHQbBh1ktsJdgRMtQQJ0hMS74HHSmbvaclsoTRNPHS1Xq/GtpaJld720wi9HQmIQ4gLooj nsbeJMrLDtcFLuHxus4qXLaAFxe/3P4= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=BOdA4Qyq; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf26.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.216.51 as permitted sender) smtp.mailfrom=ryncsn@gmail.com Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2b239b5fedaso2790079a91.0 for ; Thu, 02 May 2024 01:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714639650; x=1715244450; 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=BixicrujN2w/NN7W8Yk1bOtYDD16jf87ysiCrI+mjZw=; b=BOdA4QyqWsnNB5h0P0ec06dV+0ilDaYrdvyeSR/fwoN9ZcKyKlrD/vpXAQVPrnSmZr VT7Zei5ENTW802ZwubLfNZC3JjEkBVWx2hbpyT1HaPDPYfMdiC4GEfT5RauEYfpnTJdJ KAXhvjntw9BxT4vLJibYFtkTkwvPOakZCK+N9cKZjPOw44V3aD6xnkDMlmh3lEmUtRD2 DDRWXgOaqJ7xYAwPuvGZqs7Or523/it2x5rTZ59SsqPpVxezkNOVQznOO4wVGYE8VgRY geupDIsxpyHJ303xz9qyc9/I370kMD6yYSY1oycLaDE3ZbgRdExogPZVTEERjQK8XvaI 91iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714639650; x=1715244450; 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=BixicrujN2w/NN7W8Yk1bOtYDD16jf87ysiCrI+mjZw=; b=R41cI4utv7VdZ0Lz4OCFCaKG2cQX4QissElSgv/dhu47AZim7KC1Tz2PcRBcl7WaNQ 6snZuutveIzbAqCjFMIRo70LXZVNa9LZZHRt6Kiy7w7WsU553gjud2kII4pETVswE3j3 isWkPJKIoeLgH7MvtZK3rKNLftDMP1Tkot8HdtsjHpSE6z3CYWmr1qdussAkbsWnqx3g AK/hPt4PnyE2hIV7Vm8yN16+CWK8HOvB7cHNhS+rHNtUHg//Cln6iadIE6g3nxj2wOWG g3BvaO1mTwo4w4fBrqOh+fiiU9mGJ4lRApr/yVZgbufrfhctsLgIpRBSzgrFs0++ZJdm lphQ== X-Gm-Message-State: AOJu0YywejT2SthtEAtdBRRQGyj2ikJLQRzpAbkwE89FhNErPBfRhBy9 qZ3aLEcc3j5RJxwiH7J6AQ4T+U+q6nbqsYE1Q9VclcCSTaMDtH9Z7EPvVzrmDj4= X-Google-Smtp-Source: AGHT+IGbccr4qE+jXDa3rX92HM+k+7c2FUJ+mYHNc+51KVaTYbTEv0IftYCbT5tTMeNMMnMz/pxdug== X-Received: by 2002:a17:90a:8814:b0:2af:fe34:8ce5 with SMTP id s20-20020a17090a881400b002affe348ce5mr4726191pjn.12.1714639650104; Thu, 02 May 2024 01:47:30 -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.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 May 2024 01:47:29 -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 , Trond Myklebust , Anna Schumaker , linux-nfs@vger.kernel.org Subject: [PATCH v4 04/12] NFS: remove nfs_page_lengthg and usage of page_index Date: Thu, 2 May 2024 16:46:01 +0800 Message-ID: <20240502084609.28376-5-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 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 04B42140007 X-Stat-Signature: ixzt81h1xkr365brtyohdhfify31938r X-Rspam-User: X-HE-Tag: 1714639651-326103 X-HE-Meta: U2FsdGVkX199reKGygFRe3zP147fM1MaYWr5Najqz1K3gSIL3bOydEimd9D2TyCDLYbssaguMHzSf+e4xgitPRnueHNIIldU1+fgD5rgXRzWEKO57YN8GkPYufosnNBLh7mHIiXnVMqjbptF4afJucUoElJU8Y/hALVg6rW8C4c77envDsJU+OBkXNSLHdUdv7f9PNcBVmsOI0E1X50SsHSoZo5PsLAh7gFuM4rHrenLTNlaXBnalsZtO6rGgFweyF/yXExVnrGlNa307V/r3JYFazKHwFoimUY+wERUqa7MUHb+CCvbfdOetkBliFGBHDBk5EoNqpJqUR/lp7tjuf9v0RosD0wgKC50i9lJPjGdxD5kaPL0zJoNehc+Ie+KEYwyeFK+fSPUN7X7/6wdlWhZnVWgQP5WkXZfNl9hySQgTr3RevUKAF4c/7CmmiX5+zCb5g/B6ixgjuPJTvYmeCoe+FuNCnRYI7PGuSkdVs+io9XD7x+h2d2wygO/bqJUYGcU/SbPnIeXEh7rftVzNLJtxtcm3OeE2qm5NvkfNj5l7Cu0o+bYPTXzfW4tPci+bPFXTs4tBA50XRH6EJE8qmzDsaBUxcofLUvHOKTvM3oPzgPtQ4sgGnfzQZ17WCs8JYpAFrM/bMOM2qU9L8BNMFC9+OUHN4sD9SYjwMEoiTK56lBklufXz3/xzJg1dlL3rLN76H9RaT15itXgOfx1L0Gc6BipNFPyPMPtSfm+E9+Xl+EFpBPHXH1NykEET/fttN46nw7YCzFU++XFzR4zKxUmrp58cLuJAbGj3RkxUu3F2rvja5NnodX66SlFvH14i2W+gqGg5UJDERS5AoEEZIcOA+pUb6CQOEm5L07fyhbh18/klzNFeVVY7mqznE/8EZHmOMayRdAmsbVos9IgCP5Rfqmo0hNYjAXbDbjikGnpiAJtJaZ31pgGRxXixKY3gxyTThsWj9tP0xGN3Po AUjSkHtl R99tI+kbTeC3G5MiaAwE1+KW9R+Bhkjel6Sty1IvWd1aXqE3B+a5kmkINPPzaAPSmmYGEPDzsrI7OSPLYjmlf0l1jAovWUjBHoZDV83pZWfccAhjuOsZkPMSjmGOvWNA+bJtyfRkoEihyrqUbMbWvB9UUPZ+1dEqGKlLQI2jQZ5t1CvQA0Im7xjN2AjELCo3aE2cZWsztMVoWhtmX26jBeXPLnLCWQhgb1iIIaZLIdZg8Pdj8S51XZQ0yyE41wMO90Bepu83Cns8HQieXgfh7o7nn1hEc/sR4ciYtNIFEZx0ZmXa8L4nC2os94GRB3GBJAJj+brejgRTPnEY6kpk6SJ8nrvL7vqEJCxxXE3cbPI/bHe1BWRgVngg8G0I0iVN6Hyuu 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 This function is no longer used after commit 4fa7a717b432 ("NFS: Fix up nfs_vm_page_mkwrite() for folios"), all users have been converted to use folio instead, just delete it to remove usage of page_index. Signed-off-by: Kairui Song Cc: Trond Myklebust Cc: Anna Schumaker Cc: linux-nfs@vger.kernel.org --- fs/nfs/internal.h | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 06253695fe53..deac98dce6ac 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -790,25 +790,6 @@ static inline void nfs_folio_mark_unstable(struct folio *folio, } } -/* - * Determine the number of bytes of data the page contains - */ -static inline -unsigned int nfs_page_length(struct page *page) -{ - loff_t i_size = i_size_read(page_file_mapping(page)->host); - - if (i_size > 0) { - pgoff_t index = page_index(page); - pgoff_t end_index = (i_size - 1) >> PAGE_SHIFT; - if (index < end_index) - return PAGE_SIZE; - if (index == end_index) - return ((i_size - 1) & ~PAGE_MASK) + 1; - } - return 0; -} - /* * Determine the number of bytes of data the page contains */