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 79FF23D5221 for ; Mon, 30 Mar 2026 13:38:45 +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=1774877925; cv=none; b=jqZ4nRaNRa0BH5VkJAJnWqW+5/jikCbGb0juEzKlyByYMIzKp5Km5tJWWS1ecKAHWXpOFOQX1xUTSwHv7E0JPqOVx2gcyGWSte3CIyszl9RrAjAvvaCqnfIAH72rbwclARfRnaCFjl6xXxTEzaYJJ/AFIBTRWs4QDjn+YNv2cIk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774877925; c=relaxed/simple; bh=cZU40Ci65u926oZLO4k96TjI0rXRL98e9XlDPUbdS50=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Nun5TLrd9/SNFrXZcvF+5Ld6HocM6ue1iTE4LFfjJq2hqaRWBdU8kl9jzuC95/NR9w+gC4dhOPyFeNQwpFhSMrV5v6w1EHAek5wb1Wn+1qpqnw2VtZYq59C3HB7+rhGuKsKlZLB+ozJhl4GuH5pyeylyBUcrPjeppy/ijWraeak= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ulmsqrhr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ulmsqrhr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2AC15C4CEF7; Mon, 30 Mar 2026 13:38:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774877925; bh=cZU40Ci65u926oZLO4k96TjI0rXRL98e9XlDPUbdS50=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ulmsqrhrfyz5/FsPJWtg0jnvHoMtFh01MmoLUK3YeuX3mE2XMfTraKqKk8voMA7pe d2eGR1qx9gaZZn/gVTFttjc8NmwTfHK8qxAmNowscNVQR1SA+1dSQLp+GTEOTZB8/9 sSjkaaJRORR3LwdTZF0OsJYjkD8Slu5nT49Ie5HZe6VYoomzbNIwg4r5Qljq+ZftG7 dUWMkrtNd5+VvNv3w5/aXV1zRm19LKFZ5LO/Bt1iNeyo9mH5PQxNhhB0sVLj7oSF6h YzarGNJ46kUzzPEn5y5DW3V2S1p4iznmdGh0gpnoJKEia6VCJUVh94qRodW5YG3KCK /gfWG6HIE3wyg== From: Jeff Layton Date: Mon, 30 Mar 2026 09:38:22 -0400 Subject: [PATCH nfs-utils v2 02/16] support/export: remove unnecessary static variables in nfsd_fh expkey lookup Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260330-exportd-netlink-v2-2-cc9bd5db2408@kernel.org> References: <20260330-exportd-netlink-v2-0-cc9bd5db2408@kernel.org> In-Reply-To: <20260330-exportd-netlink-v2-0-cc9bd5db2408@kernel.org> To: Steve Dickson Cc: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , linux-nfs@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1223; i=jlayton@kernel.org; h=from:subject:message-id; bh=cZU40Ci65u926oZLO4k96TjI0rXRL98e9XlDPUbdS50=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBpynzeyzPlRBxc+KZIakeW2/cfz4h6cc5RHlh7h gUqZiOB+52JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCacp83gAKCRAADmhBGVaC FZMTD/0RZyI4RwhP0AnQm2yZ+gBD9j9HYgvTqSOvxgC0nyMmLDSixIwuCcmikdS9uiipg0L2B+H IF7Lq8LUFPDJzPbdxqEyOJN/WYYbmiKWHgXkHSDHM8lG7pi1uIgbfWQzyFXhTwHM6KzFHjv+vD1 ih9TCDn97YrWh9bppOTA2yK/4cz2Se0kKH40juAOTB6uPL1BKlWtejXBjWd/5wfchMkgutK2TPV +2VwycffhMxNiOSDAN9lH/0vHEuzWqLpk4CPawrgpEqNQ1dGbjIQIsKqk8NegyRzfqb8Nf+pZV9 0AaGVwrT/cCykJT4F1leVYWb3FEh6VBp+o80mkNZxYz2R1aZ82i8BePYzyTnNk07LnFYFlJGVb4 cB0ts8JiAxUmKpdcwi0NiS05KbWz2ESf6HHpN+rIkOSMjkmZqaFAHkkA1M5uIgZQWBIT+nwE+uM YIiC4mO59Wu1UMSOVhHKqhyNiMxnQvHJbxXPbBpUisIzDOT+SGm0jQZgez67asjwUXueSaTnbhb Jp1GGLiUS2gNb8ofHqsypB8pEhg8HFWdSaBMwSnP4SKm0DHVq9o9MvkytdsGYNhoI68mhddod1E 6Hl8tXsmB0rpa5gtFF3lGhRCx8FWeneqVWKSHHPdbcMrztIbqsVIYA+TQUDMsgGxAIvQxpPkjBE Cw+mo++2EKsGDNw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 The prev and mnt variables in the CROSSMOUNT submount iteration loop only need to persist across iterations of the inner for loop, not across calls to the function. Convert them from static to local variables scoped to the outer for loop. --- support/export/cache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/export/cache.c b/support/export/cache.c index 6859a55b7ae5c132255b756052c6ddd1734173f0..c052455889481f04631e4ef0e16cd48bc6c11964 100644 --- a/support/export/cache.c +++ b/support/export/cache.c @@ -810,7 +810,10 @@ static int nfsd_handle_fh(int f, char *bp, int blen) /* Now determine export point for this fsid/domain */ for (i=0 ; i < MCL_MAXTYPES; i++) { + nfs_export *prev = NULL; nfs_export *next_exp; + void *mnt = NULL; + for (exp = exportlist[i].p_head; exp; exp = next_exp) { char *path; @@ -820,9 +823,6 @@ static int nfsd_handle_fh(int f, char *bp, int blen) } if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT) { - static nfs_export *prev = NULL; - static void *mnt = NULL; - if (prev == exp) { /* try a submount */ path = next_mnt(&mnt, exp->m_export.e_path); -- 2.53.0