diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-08-03 22:05:00 +0300 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2016-08-04 17:11:53 -0400 |
| commit | 2b11885921a48767b6ace27c481beba3b42371ce (patch) | |
| tree | 6aaa1c452264382b3047862deb01d546167fd2a5 /fs | |
| parent | fa08139d5e02838ccabd9dcde22663d3b6780cad (diff) | |
| download | linux-stable-2b11885921a48767b6ace27c481beba3b42371ce.tar.gz linux-stable-2b11885921a48767b6ace27c481beba3b42371ce.tar.bz2 linux-stable-2b11885921a48767b6ace27c481beba3b42371ce.zip | |
nfsd: remove some dead code in nfsd_create_locked()
We changed this around in f135af1041f ('nfsd: reorganize nfsd_create')
so "dchild" can't be an error pointer any more. Also, dchild can't be
NULL here (and dput would already handle this even if it was).
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/vfs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 6666188c1138..ba944123167b 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: |