From: Jeff Layton <jlayton@kernel.org>
To: Chuck Lever <chuck.lever@oracle.com>, Neil Brown <neilb@suse.de>,
Olga Kornievskaia <kolga@netapp.com>,
Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>
Cc: Youzhong Yang <youzhong@gmail.com>,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
Jeff Layton <jlayton@kernel.org>
Subject: [PATCH 1/3] nfsd: fix refcount leak when failing to hash nfsd_file
Date: Wed, 10 Jul 2024 09:05:31 -0400 [thread overview]
Message-ID: <20240710-nfsd-next-v1-1-21fca616ac53@kernel.org> (raw)
In-Reply-To: <20240710-nfsd-next-v1-0-21fca616ac53@kernel.org>
At this point, we have a new nf that we couldn't properly insert into
the hashtable. Just free it before retrying, since it was never hashed.
Fixes: c6593366c0bf ("nfsd: don't kill nfsd_files because of lease break error")
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/nfsd/filecache.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index f84913691b78..4fb5e8546831 100644
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -1038,8 +1038,10 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,
if (likely(ret == 0))
goto open_file;
- if (ret == -EEXIST)
+ if (ret == -EEXIST) {
+ nfsd_file_free(nf);
goto retry;
+ }
trace_nfsd_file_insert_err(rqstp, inode, may_flags, ret);
status = nfserr_jukebox;
goto construction_err;
--
2.45.2
next prev parent reply other threads:[~2024-07-10 13:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-10 13:05 [PATCH 0/3] nfsd: plug some filecache refcount leaks Jeff Layton
2024-07-10 13:05 ` Jeff Layton [this message]
2024-07-11 17:05 ` [PATCH 1/3] nfsd: fix refcount leak when failing to hash nfsd_file Youzhong Yang
2024-07-11 17:53 ` Jeff Layton
2024-07-11 18:16 ` Chuck Lever III
2024-07-11 18:20 ` Jeff Layton
2024-07-11 18:27 ` Chuck Lever III
2024-07-10 13:05 ` [PATCH 2/3] nfsd: fix refcount leak when file is unhashed after being found Jeff Layton
2024-07-10 13:05 ` [PATCH 3/3] nfsd: count nfsd_file allocations Jeff Layton
2024-07-10 14:35 ` [PATCH 0/3] nfsd: plug some filecache refcount leaks Chuck Lever
2024-07-10 14:39 ` Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240710-nfsd-next-v1-1-21fca616ac53@kernel.org \
--to=jlayton@kernel.org \
--cc=Dai.Ngo@oracle.com \
--cc=chuck.lever@oracle.com \
--cc=kolga@netapp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.de \
--cc=tom@talpey.com \
--cc=youzhong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox