From: "J. Bruce Fields" <bfields@fieldses.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Jeff Layton <jlayton@poochiereds.net>,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [patch] nfsd: remove some dead code in nfsd_create_locked()
Date: Wed, 03 Aug 2016 20:50:42 +0000 [thread overview]
Message-ID: <20160803205042.GC5901@fieldses.org> (raw)
In-Reply-To: <20160803190500.GE775@mwanda>
On Wed, Aug 03, 2016 at 10:05:00PM +0300, Dan Carpenter wrote:
> We changed this around in f13058a93484 ('nfsd: reorganize nfsd_create')
> so "dchild" can't be an error pointer any more. Also we don't need to
> test if dchild is NULL because dput has a check built-in.
Thanks!
> Can it even be NULL?
It was returned from a caller's lookup_one_len, which can only return
pointers or errors, I believe. (And looks like callers also do
fh_verify and would already oops if it was null.)
Anyway, added a brief comment to that effect, fixed up the referenced
commitid (I rewrote some history there, apologies) and committed, will
push out after a few tests....
--b.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index c844fd6..cd628ce 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -1141,7 +1141,7 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp,
> char *fname, int flen, struct iattr *iap,
> int type, dev_t rdev, struct svc_fh *resfhp)
> {
> - struct dentry *dentry, *dchild = NULL;
> + struct dentry *dentry, *dchild;
> struct inode *dirp;
> __be32 err;
> __be32 err2;
> @@ -1208,8 +1208,7 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp,
> if (!err)
> err = fh_update(resfhp);
> out:
> - if (dchild && !IS_ERR(dchild))
> - dput(dchild);
> + dput(dchild);
> return err;
>
> out_nfserr:
WARNING: multiple messages have this Message-ID (diff)
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Jeff Layton <jlayton@poochiereds.net>,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [patch] nfsd: remove some dead code in nfsd_create_locked()
Date: Wed, 3 Aug 2016 16:50:42 -0400 [thread overview]
Message-ID: <20160803205042.GC5901@fieldses.org> (raw)
In-Reply-To: <20160803190500.GE775@mwanda>
On Wed, Aug 03, 2016 at 10:05:00PM +0300, Dan Carpenter wrote:
> We changed this around in f13058a93484 ('nfsd: reorganize nfsd_create')
> so "dchild" can't be an error pointer any more. Also we don't need to
> test if dchild is NULL because dput has a check built-in.
Thanks!
> Can it even be NULL?
It was returned from a caller's lookup_one_len, which can only return
pointers or errors, I believe. (And looks like callers also do
fh_verify and would already oops if it was null.)
Anyway, added a brief comment to that effect, fixed up the referenced
commitid (I rewrote some history there, apologies) and committed, will
push out after a few tests....
--b.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index c844fd6..cd628ce 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -1141,7 +1141,7 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp,
> char *fname, int flen, struct iattr *iap,
> int type, dev_t rdev, struct svc_fh *resfhp)
> {
> - struct dentry *dentry, *dchild = NULL;
> + struct dentry *dentry, *dchild;
> struct inode *dirp;
> __be32 err;
> __be32 err2;
> @@ -1208,8 +1208,7 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp,
> if (!err)
> err = fh_update(resfhp);
> out:
> - if (dchild && !IS_ERR(dchild))
> - dput(dchild);
> + dput(dchild);
> return err;
>
> out_nfserr:
next prev parent reply other threads:[~2016-08-03 20:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-03 19:05 [patch] nfsd: remove some dead code in nfsd_create_locked() Dan Carpenter
2016-08-03 19:05 ` Dan Carpenter
2016-08-03 20:50 ` J. Bruce Fields [this message]
2016-08-03 20:50 ` 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=20160803205042.GC5901@fieldses.org \
--to=bfields@fieldses.org \
--cc=dan.carpenter@oracle.com \
--cc=jlayton@poochiereds.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.