diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2016-07-22 19:03:46 +0300 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2016-08-05 00:11:51 +0300 |
| commit | 71423274498169911bf9eedf02d5e7ac0a083801 (patch) | |
| tree | 7db52e220fd1f6cc381aba0f00ed18516d1a1e9d /fs | |
| parent | d03d9fe476ea81ad3be25967ef35a671dbd79b55 (diff) | |
| download | linux-71423274498169911bf9eedf02d5e7ac0a083801.tar.xz | |
nfsd: clean up bad-type check in nfsd_create_locked
Minor cleanup, no change in behavior.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/vfs.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index c95709486ca4..1809624997f0 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1166,13 +1166,6 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp, iap->ia_mode = 0; iap->ia_mode = (iap->ia_mode & S_IALLUGO) | type; - err = nfserr_inval; - if (!S_ISREG(type) && !S_ISDIR(type) && !special_file(type)) { - printk(KERN_WARNING "nfsd: bad file type %o in nfsd_create\n", - type); - goto out; - } - err = 0; host_err = 0; switch (type) { @@ -1190,6 +1183,10 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp, case S_IFSOCK: host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev); break; + default: + printk(KERN_WARNING "nfsd: bad file type %o in nfsd_create\n", + type); + host_err = -EINVAL; } if (host_err < 0) goto out_nfserr; |