From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B0268C133; Tue, 26 Aug 2025 13:59:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756216751; cv=none; b=g7BBvhXEVBtRBLwQoycdQgloqa5pW+pBQQAWtRfROsrM2qrde5AFgA4MtVgpZzn7rtgYMMt8Caq2uVH0lYZ2sFlK/H9zfHF+72sOC7m99T5g6iyHc1H2BSi7PO/hBNFQZVc/ahfD8wzcsFXMJvgKo3lV9mnQRgaKYOk3s6fvPYU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756216751; c=relaxed/simple; bh=3tUtQmifoFGwVwUPos4RaDBMS7hmRFFG3IfnOAwEczM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oGt1CQd+gvf9EGGoagmTHCIbcDSq4KYX3outTKM5aazkXazDMS5iRbIzw+fNrsUoXfKmXRe4qxptrn7UrH0MtKHK6nMVAU8NkVAiTUNeA+AozZxGaUW52pUcb8YdSMD8YgZm5c3M7WIcNtLqfkOcsKrhvDsuuPhINVT61R9e4Ag= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nHu9ukfJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="nHu9ukfJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAF84C4CEF1; Tue, 26 Aug 2025 13:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756216750; bh=3tUtQmifoFGwVwUPos4RaDBMS7hmRFFG3IfnOAwEczM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nHu9ukfJZ7cSQJFJuWvQEk+3JzKqsqAOWWVJ3erwCED3ED1sUT61NC5UtLbxNm0HT usC3jCxOBWQXS+Y+QnqOTsR1CUGsRXD+a4wEPIuIKh/mLnK+quY0RYM01QoBXtXlN4 RXerhP82pdHMJXDwJ4MUPpUXj4QlibM//TzmUci4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Anna Schumaker , Trond Myklebust , Sasha Levin Subject: [PATCH 5.15 529/644] NFS: Create an nfs4_server_set_init_caps() function Date: Tue, 26 Aug 2025 13:10:20 +0200 Message-ID: <20250826110959.622308985@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110946.507083938@linuxfoundation.org> References: <20250826110946.507083938@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Anna Schumaker [ Upstream commit 01dde76e471229e3437a2686c572f4980b2c483e ] And call it before doing an FSINFO probe to reset to the baseline capabilities before probing. Signed-off-by: Anna Schumaker Signed-off-by: Trond Myklebust Stable-dep-of: b01f21cacde9 ("NFS: Fix the setting of capabilities when automounting a new filesystem") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/nfs/internal.h | 1 + fs/nfs/nfs4client.c | 33 +++++++++++++++++++-------------- fs/nfs/nfs4proc.c | 2 ++ 3 files changed, 22 insertions(+), 14 deletions(-) --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -219,6 +219,7 @@ extern struct nfs_client * nfs4_find_client_sessionid(struct net *, const struct sockaddr *, struct nfs4_sessionid *, u32); extern struct nfs_server *nfs_create_server(struct fs_context *); +extern void nfs4_server_set_init_caps(struct nfs_server *); extern struct nfs_server *nfs4_create_server(struct fs_context *); extern struct nfs_server *nfs4_create_referral_server(struct fs_context *); extern int nfs4_update_server(struct nfs_server *server, const char *hostname, --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -1065,6 +1065,24 @@ static void nfs4_session_limit_xasize(st #endif } +void nfs4_server_set_init_caps(struct nfs_server *server) +{ + /* Set the basic capabilities */ + server->caps |= server->nfs_client->cl_mvops->init_caps; + if (server->flags & NFS_MOUNT_NORDIRPLUS) + server->caps &= ~NFS_CAP_READDIRPLUS; + if (server->nfs_client->cl_proto == XPRT_TRANSPORT_RDMA) + server->caps &= ~NFS_CAP_READ_PLUS; + + /* + * Don't use NFS uid/gid mapping if we're using AUTH_SYS or lower + * authentication. + */ + if (nfs4_disable_idmapping && + server->client->cl_auth->au_flavor == RPC_AUTH_UNIX) + server->caps |= NFS_CAP_UIDGID_NOMAP; +} + static int nfs4_server_common_setup(struct nfs_server *server, struct nfs_fh *mntfh, bool auth_probe) { @@ -1084,20 +1102,7 @@ static int nfs4_server_common_setup(stru if (error < 0) goto out; - /* Set the basic capabilities */ - server->caps |= server->nfs_client->cl_mvops->init_caps; - if (server->flags & NFS_MOUNT_NORDIRPLUS) - server->caps &= ~NFS_CAP_READDIRPLUS; - if (server->nfs_client->cl_proto == XPRT_TRANSPORT_RDMA) - server->caps &= ~NFS_CAP_READ_PLUS; - /* - * Don't use NFS uid/gid mapping if we're using AUTH_SYS or lower - * authentication. - */ - if (nfs4_disable_idmapping && - server->client->cl_auth->au_flavor == RPC_AUTH_UNIX) - server->caps |= NFS_CAP_UIDGID_NOMAP; - + nfs4_server_set_init_caps(server); /* Probe the root fh to retrieve its FSID and filehandle */ error = nfs4_get_rootfh(server, mntfh, auth_probe); --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3968,6 +3968,8 @@ int nfs4_server_capabilities(struct nfs_ .interruptible = true, }; int err; + + nfs4_server_set_init_caps(server); do { err = nfs4_handle_exception(server, _nfs4_server_capabilities(server, fhandle),