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 471A1C83F0A for ; Tue, 8 Jul 2025 16:06:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F2A826B0098; Tue, 8 Jul 2025 12:06:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EDA626B009A; Tue, 8 Jul 2025 12:06:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA16F6B009B; Tue, 8 Jul 2025 12:06:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C6FC86B0098 for ; Tue, 8 Jul 2025 12:06:42 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8DD51C06C1 for ; Tue, 8 Jul 2025 16:06:42 +0000 (UTC) X-FDA: 83641575444.29.02B1DBE Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf08.hostedemail.com (Postfix) with ESMTP id C7E4A160015 for ; Tue, 8 Jul 2025 16:06:40 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=V1lFqXgV; spf=pass (imf08.hostedemail.com: domain of snitzer@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=snitzer@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751990801; h=from:from:sender: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=M2Q4fqlHMn+FmVwQN4DV8oRKwJhv+JMj6ZWDVHag+Zw=; b=0K6einDaBckMkzWhb/Fbc9TpbxwNm30fJAxyYY0XLkLgAD/l8EyrWqBpcaWQQU8n5A1awA jFqVu0ZqaNVJIci+7uCEquEck7Zat3jME4xWQHng22P+ab+8PSd924qDYA6/mHb7tBRJ6W Q6HrTuwR2Ph25bypOb2a6EkSdn8/A4U= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=V1lFqXgV; spf=pass (imf08.hostedemail.com: domain of snitzer@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=snitzer@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751990801; a=rsa-sha256; cv=none; b=Z/SaJrrH8YMZE9Rrs3mE5XwvxWbcUtPhS6xVpy7fBcgzneTwDpyY3OYO3OHxXfBDdMpxFB IQJM0vH2EIXXdeYaoQ18E/75pM45uxojqg7k7ICTHkm+ZIq9BpWvPnQ0k0RL5SEU4wOwp5 vpfw2Q+4TkSSQo03Cq6pKDfdEMP6nnI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 750A844CDB; Tue, 8 Jul 2025 16:06:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 229C2C4CEED; Tue, 8 Jul 2025 16:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751990799; bh=tsMCCgN6hj9WcxmYbGSE2VXS0hC23/ToUofbAjYSJlA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V1lFqXgVU84+W0OWC/X+HxUmapdV/58ccriteJWdLc4wnlE2GR2MZxjA9AXTlV6dJ m68y5l3TTPLONolrFakyQryVKbtw/sEyWth//kAuIFoV3MKJYH4+HdlC33lP8qhrir c7Z6/eimnQVLFvVylTnOOBv2emPSLycjOAb8zbeF1wVKOS6+bSYctuDQA/lB6YI6b9 sTJLxVkR9cLriXc3f2AbSkVyoo9e3mPaZ4vIaMdaN4V7Mb0zGolxFqSwtGOP7Y5kJQ JyQZKXQROF57Sq5NxOoyTnUfO3DN2I2i0Mu0NgHPN7snosCjZf4G/7spHf+CIXtMnq 2K+l6s86c78VQ== From: Mike Snitzer To: Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linus-fsdevel@vger.kernel.org, linux-mm@kvack.org, snitzer@kernel.org Subject: [RFC PATCH v2 2/8] NFSD: Move the fh_getattr() helper Date: Tue, 8 Jul 2025 12:06:13 -0400 Message-ID: <20250708160619.64800-3-snitzer@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250708160619.64800-1-snitzer@kernel.org> References: <20250708160619.64800-1-snitzer@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: C7E4A160015 X-Rspamd-Server: rspam09 X-Stat-Signature: 8qorh1miyb9cp7kj1zoir57bmdohyfmr X-HE-Tag: 1751990800-389319 X-HE-Meta: U2FsdGVkX18cdE/9fBVvC54mXVTYKquAucbpmrmZuwI9PQFa3p1bIzQggzM46C4GegEwvDjvjjD0Sh0NjFwmi18VCo/4nLTOLy4P9BhP2QxihLUB/xStOzLZV6Hh55HwmfGFmsrmGSVQS4lBxkRMxebubrmRESm0eVt5ZQaWllM9+E9zEBEPNT6gTjcsfg5Shv0SJj29jX5DdlF040Y0hIXsq3ICvvK6kfuQHaVTiTvO+IvSyOMGoSwCkxtgCC6iKehnGm5yTs2O/Wn+BOgkhptS2pc+JEA4gT6yOxmPlUHMP8FB+qAA8BQKUYulZo2n0XB2xLphlDRx9WEnk/J0ucct7BqePmVUr8rMjO99xF3r9sjaARM2nnXDVMsReoJsRoqzN26ktPI4Dit4DfvtY2HUG9LtMkyLRhNjOQRo//QcPCa2lK/dKDOb87FBTO1rFRH8l0N75gE9gMdXNKeeAn0HVfruaRyf5swWSIC43Qwt5ydszWtQbg9G5SmDKr+dapxuO/fhQpCUz1j+/lByWlFVKG/pquGrj7/Xax8hiUlTG32lsQFLxBGORAUBmBPsoQVUaF+CDjs4YnqZBNkCOigFrileNqpaDX4rtEEF3ewxvk+L4QWIG0jUQYlp9/NVLhITyYHflPJ9QPNSxz5xjn//mtRCIKkbI3nTBBw2S4hQ9CnHNW7K05eM02ALDvuCW4cbPwKRjS9633d2uUJUGcZXGqbIF5VZAyeK7tBW3Zv6mXso00oq7AK45r0Zk5amaxO5vw0C8dcxTOPYTQbXiWc6b+mMVWToHpH6yorVWlw+3iGJHTB70kXGben7KHm1wRSMKAd2+u1zMMQJQmjbW46szvs0+VKDfSuRy8NNhz8wWvMyXJYfzRXCEpXtsLTer4ONXkNgdXh2GnhN1YDs3ntYCqEykqt45uRVJxqDL4CIkigCfW1KB2asZB8ScJ7AEUvlfUx2xDMTS+BLvsw dRr5IGV3 kowOFMeCoSoOrfoelSiHA4JARlUpS99lBTAtZqFx0LrC7PtllcNiXL4QEQOKoAuz3cdbHxHzBN9f6fPGMhCJfOrHosWcq5uEN96sQbojemS3BkpHCFRpPUZZS1kZ3ZvTSMFSkJNTox9nvEETXxVCf8wY+7+TiShsgtllsUK94MYrHUfta9ySQzz8uusVoxLnpe34k2vBk67D7iqwI1uvZQ116FUnq76zHWU1TUNWG0nlLNMAJ3zmr5vQLYJT/oqfOd0Vpu9OwR4Z3IjL0EUTrjrpwfMh2x0xVUL/SxGEueRmtEofdVotk8qFtWlKfkejcXmvelQr4ivNGt/iz9NGZkbZXdA== 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: Chuck Lever Clean up: The fh_getattr() function is part of NFSD's file handle API, so relocate it. I've made it an un-inlined function so that trace points and new functionality can easily be introduced. That increases the size of nfsd.ko by about a page on my x86_64 system (out of 26MB; compiled with -O2). Signed-off-by: Chuck Lever Signed-off-by: Mike Snitzer --- fs/nfsd/nfsfh.c | 23 +++++++++++++++++++++++ fs/nfsd/nfsfh.h | 1 + fs/nfsd/vfs.h | 13 ------------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 16e6b4428d55..f4a3cc9e31e0 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -663,6 +663,29 @@ fh_update(struct svc_fh *fhp) return nfserr_serverfault; } +/** + * fh_getattr - Retrieve attributes on a local file + * @fhp: File handle of target file + * @stat: Caller-supplied kstat buffer to be filled in + * + * Returns nfs_ok on success, otherwise an NFS status code is + * returned. + */ +__be32 fh_getattr(const struct svc_fh *fhp, struct kstat *stat) +{ + struct path p = { + .mnt = fhp->fh_export->ex_path.mnt, + .dentry = fhp->fh_dentry, + }; + u32 request_mask = STATX_BASIC_STATS; + + if (fhp->fh_maxsize == NFS4_FHSIZE) + request_mask |= (STATX_BTIME | STATX_CHANGE_COOKIE); + + return nfserrno(vfs_getattr(&p, stat, request_mask, + AT_STATX_SYNC_AS_STAT)); +} + /** * fh_fill_pre_attrs - Fill in pre-op attributes * @fhp: file handle to be updated diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h index 6f5255d1c190..5ef7191f8ad8 100644 --- a/fs/nfsd/nfsfh.h +++ b/fs/nfsd/nfsfh.h @@ -222,6 +222,7 @@ extern char * SVCFH_fmt(struct svc_fh *fhp); __be32 fh_verify(struct svc_rqst *, struct svc_fh *, umode_t, int); __be32 fh_verify_local(struct net *, struct svc_cred *, struct auth_domain *, struct svc_fh *, umode_t, int); +__be32 fh_getattr(const struct svc_fh *fhp, struct kstat *stat); __be32 fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *); __be32 fh_update(struct svc_fh *); void fh_put(struct svc_fh *); diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h index 4007dcbbbfef..0c0292611c6d 100644 --- a/fs/nfsd/vfs.h +++ b/fs/nfsd/vfs.h @@ -160,17 +160,4 @@ __be32 nfsd_permission(struct svc_cred *cred, struct svc_export *exp, void nfsd_filp_close(struct file *fp); -static inline __be32 fh_getattr(const struct svc_fh *fh, struct kstat *stat) -{ - u32 request_mask = STATX_BASIC_STATS; - struct path p = {.mnt = fh->fh_export->ex_path.mnt, - .dentry = fh->fh_dentry}; - - if (fh->fh_maxsize == NFS4_FHSIZE) - request_mask |= (STATX_BTIME | STATX_CHANGE_COOKIE); - - return nfserrno(vfs_getattr(&p, stat, request_mask, - AT_STATX_SYNC_AS_STAT)); -} - #endif /* LINUX_NFSD_VFS_H */ -- 2.44.0