From: "J. Bruce Fields" <bfields@fieldses.org>
To: NeilBrown <neilb@suse.de>
Cc: Jeff Layton <jlayton@kernel.org>, linux-nfs@vger.kernel.org
Subject: Re: nfs4_show_superblock considered harmful :-)
Date: Thu, 16 Jul 2020 21:03:01 -0400 [thread overview]
Message-ID: <20200717010301.GC18568@fieldses.org> (raw)
In-Reply-To: <87tuy7vxeb.fsf@notabene.neil.brown.name>
On Fri, Jul 17, 2020 at 09:43:40AM +1000, NeilBrown wrote:
> On Thu, Jul 16 2020, J. Bruce Fields wrote:
> > --- a/fs/nfsd/nfs4state.c
> > +++ b/fs/nfsd/nfs4state.c
> > @@ -507,6 +507,16 @@ find_any_file(struct nfs4_file *f)
> > return ret;
> > }
> >
> > +static struct nfsd_file *find_deleg_file(struct nfs4_file *f)
> > +{
> > + struct nfsd_file *ret;
> > +
> > + spin_lock(&f->fi_lock);
> > + ret = nfsd_file_get(f->fi_deleg_file);
>
> A test on f->fi_deleg_file being non-NULL would make this look safer.
> It would also make the subsequent test on the return value appear sane.
Yes, thanks!-b.
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index c2a2e56c896d..6e8811e7c134 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -509,10 +509,11 @@ find_any_file(struct nfs4_file *f)
static struct nfsd_file *find_deleg_file(struct nfs4_file *f)
{
- struct nfsd_file *ret;
+ struct nfsd_file *ret = NULL;
spin_lock(&f->fi_lock);
- ret = nfsd_file_get(f->fi_deleg_file);
+ if (f->fi_deleg_file)
+ ret = nfsd_file_get(f->fi_deleg_file);
spin_unlock(&f->fi_lock);
return ret;
}
next prev parent reply other threads:[~2020-07-17 1:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 0:53 nfs4_show_superblock considered harmful :-) NeilBrown
2020-05-29 22:06 ` J. Bruce Fields
2020-06-01 2:01 ` NeilBrown
2020-07-15 18:54 ` J. Bruce Fields
2020-07-15 23:05 ` NeilBrown
2020-07-15 23:43 ` J. Bruce Fields
2020-07-16 17:19 ` J. Bruce Fields
2020-07-16 23:43 ` NeilBrown
2020-07-17 1:03 ` J. Bruce Fields [this message]
2020-07-17 1:31 ` NeilBrown
2020-07-17 2:18 ` J. Bruce Fields
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=20200717010301.GC18568@fieldses.org \
--to=bfields@fieldses.org \
--cc=jlayton@kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.de \
/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;
as well as URLs for NNTP newsgroup(s).