diff options
author | J. Bruce Fields <bfields@redhat.com> | 2016-07-22 12:03:46 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2016-08-04 17:11:51 -0400 |
commit | 71423274498169911bf9eedf02d5e7ac0a083801 (patch) | |
tree | 7db52e220fd1f6cc381aba0f00ed18516d1a1e9d /fs/nfsd/vfs.c | |
parent | d03d9fe476ea81ad3be25967ef35a671dbd79b55 (diff) |
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/nfsd/vfs.c')
-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, | |||
1166 | iap->ia_mode = 0; | 1166 | iap->ia_mode = 0; |
1167 | iap->ia_mode = (iap->ia_mode & S_IALLUGO) | type; | 1167 | iap->ia_mode = (iap->ia_mode & S_IALLUGO) | type; |
1168 | 1168 | ||
1169 | err = nfserr_inval; | ||
1170 | if (!S_ISREG(type) && !S_ISDIR(type) && !special_file(type)) { | ||
1171 | printk(KERN_WARNING "nfsd: bad file type %o in nfsd_create\n", | ||
1172 | type); | ||
1173 | goto out; | ||
1174 | } | ||
1175 | |||
1176 | err = 0; | 1169 | err = 0; |
1177 | host_err = 0; | 1170 | host_err = 0; |
1178 | switch (type) { | 1171 | switch (type) { |
@@ -1190,6 +1183,10 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
1190 | case S_IFSOCK: | 1183 | case S_IFSOCK: |
1191 | host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev); | 1184 | host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev); |
1192 | break; | 1185 | break; |
1186 | default: | ||
1187 | printk(KERN_WARNING "nfsd: bad file type %o in nfsd_create\n", | ||
1188 | type); | ||
1189 | host_err = -EINVAL; | ||
1193 | } | 1190 | } |
1194 | if (host_err < 0) | 1191 | if (host_err < 0) |
1195 | goto out_nfserr; | 1192 | goto out_nfserr; |