diff options
Diffstat (limited to 'fs/nfsd/nfsproc.c')
-rw-r--r-- | fs/nfsd/nfsproc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index a047ad6111ef..08e17264784b 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c | |||
@@ -144,7 +144,7 @@ nfsd_proc_read(struct svc_rqst *rqstp, struct nfsd_readargs *argp, | |||
144 | svc_reserve_auth(rqstp, (19<<2) + argp->count + 4); | 144 | svc_reserve_auth(rqstp, (19<<2) + argp->count + 4); |
145 | 145 | ||
146 | resp->count = argp->count; | 146 | resp->count = argp->count; |
147 | nfserr = nfsd_read(rqstp, fh_copy(&resp->fh, &argp->fh), NULL, | 147 | nfserr = nfsd_read(rqstp, fh_copy(&resp->fh, &argp->fh), |
148 | argp->offset, | 148 | argp->offset, |
149 | rqstp->rq_vec, argp->vlen, | 149 | rqstp->rq_vec, argp->vlen, |
150 | &resp->count); | 150 | &resp->count); |
@@ -290,7 +290,6 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp, | |||
290 | * gospel of sun micro | 290 | * gospel of sun micro |
291 | */ | 291 | */ |
292 | if (type != S_IFREG) { | 292 | if (type != S_IFREG) { |
293 | int is_borc = 0; | ||
294 | if (type != S_IFBLK && type != S_IFCHR) { | 293 | if (type != S_IFBLK && type != S_IFCHR) { |
295 | rdev = 0; | 294 | rdev = 0; |
296 | } else if (type == S_IFCHR && !(attr->ia_valid & ATTR_SIZE)) { | 295 | } else if (type == S_IFCHR && !(attr->ia_valid & ATTR_SIZE)) { |
@@ -298,7 +297,6 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp, | |||
298 | type = S_IFIFO; | 297 | type = S_IFIFO; |
299 | } else { | 298 | } else { |
300 | /* Okay, char or block special */ | 299 | /* Okay, char or block special */ |
301 | is_borc = 1; | ||
302 | if (!rdev) | 300 | if (!rdev) |
303 | rdev = wanted; | 301 | rdev = wanted; |
304 | } | 302 | } |