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 840D73A0E93 for ; Mon, 16 Mar 2026 15:16:55 +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=1773674215; cv=none; b=bWU+SsFmWqtbiNYtFnm3Xh+/PgcWDA5k+YhcM4mMjfNiUrsvk4AmzBNyaU2vte7pQPiA8MmLLgQIx51sld59iipMVvDsnWen2Kx0TY5vn6oIo6ZhacywV625MZYCqA+wELdwpt2jhb8o+8SUfnElkTijgOOoulOd4h4NP2c9FAM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773674215; c=relaxed/simple; bh=cZU40Ci65u926oZLO4k96TjI0rXRL98e9XlDPUbdS50=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eXuopf9CBOxJeWlSvzrEwHEmafLbv+Dl4Ju5m+YDlEAAH0dbhfPbOAuxwF2gftTS3kXzWASI/AtqAT9fYm9ZeArMO8v9n0pR/Vr7f07vOkSvu3l3SWwdEZinBUXPdaV5Hx71xBcCAgUdCuglb8mYoEk29laa764kVs4BGLp7Wms= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eX5DIuN0; 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="eX5DIuN0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6382BC2BC87; Mon, 16 Mar 2026 15:16:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773674215; bh=cZU40Ci65u926oZLO4k96TjI0rXRL98e9XlDPUbdS50=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eX5DIuN0l3aNYqOazFerfHWCcNHLTcoTPHZ8SjxF0l/zKkehyqGuMTdFEJd3voEJL v1sSSAglranVQf+G2wXA8w5Qn5i1NCx595Q3JEF2sBVkO3lyJX+OvxkCXoE1P4lc7o P8IgLifaLidBQSm0S4q9SHBeGDNrDKD6jXDclXAfUcy0UH8upFYkWk0UV0ga4hFotF l96IEG+D2eD753hi7fnTWi3HbGwsWid7wtEThMzOO5laJvqvXNPJ7SAnfKLBe5UDNE wMnY0wIugQab6qr6jnRiH9vzlRMOiaQ81jnLnmDT4q2nfuhOhJGErcnPykxrDaJDU7 SZYxXRKjEX32g== From: Jeff Layton Date: Mon, 16 Mar 2026 11:16:40 -0400 Subject: [PATCH nfs-utils 02/17] 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: <20260316-exportd-netlink-v1-2-9a408a0b389d@kernel.org> References: <20260316-exportd-netlink-v1-0-9a408a0b389d@kernel.org> In-Reply-To: <20260316-exportd-netlink-v1-0-9a408a0b389d@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/ZANAwAKAQAOaEEZVoIVAcsmYgBpuB7gOtoktN+Q2yjwmmKufbrKg9+kkjc2PTB2c Na0XKvmSRaJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCabge4AAKCRAADmhBGVaC FR5BEADDNgkWG5hpUVejKZSCsD5fTs/HPZ10h6iONgL7/LdQit5tXDdFs6RvRwsEy7M/P/t4BsH 0J4Ev1XDekxQLm/eoEfrkQVlstaqEXW+HPtt8SLzzmv6/ohhhgqc8IsoY2zEmLGMhhUVR2985Yl DiUfReja8htEAU2FYjW/OfuPFCFaxk36l8ut0iPdy3glYKMBI/dRslKbpf4REdR8Msxq1bB5x06 GYDENm9db2gNa6ex3fjRS2GbDWToe0g4wX47arx1NMmb0ViZjjoJ+KK6ckC7Ez04X7l45ws9KSs ASYX0bMYo707CDtYo6G1gIPtwDZOnQsXeWkSDYBDEfYgN7ukRVTt/ydPsGXoD8EYqYIsNGloS1H EsFidceLQpv9fgXgcIZHmaa9rACKqc36TQzeHcKo28l+dhCWG4Gp26x7Rvp3uC3OTLJhvN6YJr1 jQbrxpwZwWG2JTM0ZUDEbFMdL1sE1VcoiGtYNxcOQwuFrGBmRtiewNWU68/bP+QVRG+lFb4hbgN zWdJ3bI1DfZiLjMyMxvWEDk2eBzzjNj802zY4qSxnB+cwJEwHHiZK83AtHd2kbxlp4wjHuPjQA/ auMEBP5cbFPKmRMQypzvSx9/vkjDacDbRA1cc8AJxu75G+EKK05hqoGhNkBeZsF78g3awLpvBoi COnvwEV106eDtsg== 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