39c39
< * $FreeBSD: head/sys/kern/kern_descrip.c 82516 2001-08-29 18:53:53Z ache $
---
> * $FreeBSD: head/sys/kern/kern_descrip.c 82749 2001-09-01 19:04:37Z dillon $
118a119,121
> /*
> * MPSAFE
> */
125a129
> mtx_lock(&Giant);
127a132
> mtx_unlock(&Giant);
142a148,150
> /*
> * MPSAFE
> */
152a161
> mtx_lock(&Giant);
158c167,168
< return (EBADF);
---
> error = EBADF;
> goto done2;
162c172,173
< return (0);
---
> error = 0;
> goto done2;
166c177
< return (error);
---
> goto done2;
174c185,188
< return (do_dup(fdp, (int)old, (int)new, p->p_retval, p));
---
> error = do_dup(fdp, (int)old, (int)new, p->p_retval, p);
> done2:
> mtx_unlock(&Giant);
> return(error);
184a199,201
> /*
> * MPSAFE
> */
194a212
> mtx_lock(&Giant);
197,198c215,218
< if (old >= fdp->fd_nfiles || fdp->fd_ofiles[old] == NULL)
< return (EBADF);
---
> if (old >= fdp->fd_nfiles || fdp->fd_ofiles[old] == NULL) {
> error = EBADF;
> goto done2;
> }
200,201c220,224
< return (error);
< return (do_dup(fdp, (int)old, new, p->p_retval, p));
---
> goto done2;
> error = do_dup(fdp, (int)old, new, p->p_retval, p);
> done2:
> mtx_unlock(&Giant);
> return (error);
213a237,239
> /*
> * MPSAFE
> */
220c246
< register struct filedesc *fdp = p->p_fd;
---
> register struct filedesc *fdp;
224c250
< int i, tmp, error, flg = F_POSIX;
---
> int i, tmp, error = 0, flg = F_POSIX;
227a254,256
> mtx_lock(&Giant);
>
> fdp = p->p_fd;
229,230c258,261
< (fp = fdp->fd_ofiles[uap->fd]) == NULL)
< return (EBADF);
---
> (fp = fdp->fd_ofiles[uap->fd]) == NULL) {
> error = EBADF;
> goto done2;
> }
237,238c268,271
< newmin >= maxfilesperproc)
< return (EINVAL);
---
> newmin >= maxfilesperproc) {
> error = EINVAL;
> break;
> }
240,241c273,275
< return (error);
< return (do_dup(fdp, uap->fd, i, p->p_retval, p));
---
> break;
> error = do_dup(fdp, uap->fd, i, p->p_retval, p);
> break;
245c279
< return (0);
---
> break;
249c283
< return (0);
---
> break;
253c287
< return (0);
---
> break;
263c297
< return (error);
---
> break;
269c303
< return (0);
---
> break;
275c309
< return (error);
---
> break;
281c315
< return(error);
---
> break;
287c321
< return(error);
---
> break;
294,295c328,331
< if (fp->f_type != DTYPE_VNODE)
< return (EBADF);
---
> if (fp->f_type != DTYPE_VNODE) {
> error = EBADF;
> break;
> }
307c343
< return (error);
---
> break;
314c350,351
< return (EOVERFLOW);
---
> error = EOVERFLOW;
> break;
347,348c384
< return(error);
<
---
> break;
350,351c386,389
< if (fp->f_type != DTYPE_VNODE)
< return (EBADF);
---
> if (fp->f_type != DTYPE_VNODE) {
> error = EBADF;
> break;
> }
362c400
< return (error);
---
> break;
367c405,406
< return (EINVAL);
---
> error = EINVAL;
> break;
375c414,415
< return (EOVERFLOW);
---
> error = EOVERFLOW;
> break;
386c426
< return(error);
---
> break;
388c428,429
< return (EINVAL);
---
> error = EINVAL;
> break;
390c431,433
< /* NOTREACHED */
---
> done2:
> mtx_unlock(&Giant);
> return (error);
570a614,616
> /*
> * MPSAFE
> */
577c623
< register struct filedesc *fdp = p->p_fd;
---
> register struct filedesc *fdp;
579a626
> int error = 0;
580a628,629
> mtx_lock(&Giant);
> fdp = p->p_fd;
582,583c631,634
< (fp = fdp->fd_ofiles[fd]) == NULL)
< return (EBADF);
---
> (fp = fdp->fd_ofiles[fd]) == NULL) {
> error = EBADF;
> goto done2;
> }
601c652,655
< return (closef(fp, p));
---
> error = closef(fp, p);
> done2:
> mtx_unlock(&Giant);
> return(error);
613a668,670
> /*
> * MPSAFE
> */
625a683,684
> mtx_lock(&Giant);
>
627,628c686,689
< (fp = fdp->fd_ofiles[uap->fd]) == NULL)
< return (EBADF);
---
> (fp = fdp->fd_ofiles[uap->fd]) == NULL) {
> error = EBADF;
> goto done2;
> }
635a697,698
> done2:
> mtx_unlock(&Giant);
648a712,714
> /*
> * MPSAFE
> */
655c721
< register struct filedesc *fdp = p->p_fd;
---
> register struct filedesc *fdp;
659a726,728
> mtx_lock(&Giant);
> fdp = p->p_fd;
>
661,662c730,733
< (fp = fdp->fd_ofiles[uap->fd]) == NULL)
< return (EBADF);
---
> (fp = fdp->fd_ofiles[uap->fd]) == NULL) {
> error = EBADF;
> goto done2;
> }
667a739,740
> done2:
> mtx_unlock(&Giant);
679a753,755
> /*
> * MPSAFE
> */
686c762
< register struct filedesc *fdp = p->p_fd;
---
> register struct filedesc *fdp;
691a768,770
> mtx_lock(&Giant);
>
> fdp = p->p_fd;
693,694c772,775
< (fp = fdp->fd_ofiles[uap->fd]) == NULL)
< return (EBADF);
---
> (fp = fdp->fd_ofiles[uap->fd]) == NULL) {
> error = EBADF;
> goto done2;
> }
701a783,784
> done2:
> mtx_unlock(&Giant);
713a797,799
> /*
> * MPSAFE
> */
720c806
< struct filedesc *fdp = p->p_fd;
---
> struct filedesc *fdp;
724a811,813
> mtx_lock(&Giant);
> fdp = p->p_fd;
>
726,727c815,818
< (fp = fdp->fd_ofiles[uap->fd]) == NULL)
< return (EBADF);
---
> (fp = fdp->fd_ofiles[uap->fd]) == NULL) {
> error = EBADF;
> goto done2;
> }
734,735c825,828
< if (uap->name != _PC_PIPE_BUF)
< return (EINVAL);
---
> if (uap->name != _PC_PIPE_BUF) {
> error = EINVAL;
> goto done2;
> }
748a842,843
> done2:
> mtx_unlock(&Giant);
1276a1372,1374
> /*
> * MPSAFE
> */
1286a1385
> int error;
1287a1387,1388
> mtx_lock(&Giant);
>
1289,1292c1390,1397
< (fp = fdp->fd_ofiles[uap->fd]) == NULL)
< return (EBADF);
< if (fp->f_type != DTYPE_VNODE)
< return (EOPNOTSUPP);
---
> (fp = fdp->fd_ofiles[uap->fd]) == NULL) {
> error = EBADF;
> goto done2;
> }
> if (fp->f_type != DTYPE_VNODE) {
> error = EOPNOTSUPP;
> goto done2;
> }
1300c1405,1406
< return (VOP_ADVLOCK(vp, (caddr_t)fp, F_UNLCK, &lf, F_FLOCK));
---
> error = VOP_ADVLOCK(vp, (caddr_t)fp, F_UNLCK, &lf, F_FLOCK);
> goto done2;
1306,1307c1412,1415
< else
< return (EBADF);
---
> else {
> error = EBADF;
> goto done2;
> }
1310,1311c1418,1423
< return (VOP_ADVLOCK(vp, (caddr_t)fp, F_SETLK, &lf, F_FLOCK));
< return (VOP_ADVLOCK(vp, (caddr_t)fp, F_SETLK, &lf, F_FLOCK|F_WAIT));
---
> error = VOP_ADVLOCK(vp, (caddr_t)fp, F_SETLK, &lf, F_FLOCK);
> else
> error = VOP_ADVLOCK(vp, (caddr_t)fp, F_SETLK, &lf, F_FLOCK|F_WAIT);
> done2:
> mtx_unlock(&Giant);
> return (error);