26c26
< * $FreeBSD: head/sys/kern/kern_module.c 71999 2001-02-04 13:13:25Z phk $
---
> * $FreeBSD: head/sys/kern/kern_module.c 82749 2001-09-01 19:04:37Z dillon $
38a39,40
> #include <sys/lock.h>
> #include <sys/mutex.h>
218a221,223
> /*
> * MPSAFE
> */
222a228
> int error = 0;
223a230,231
> mtx_lock(&Giant);
>
227c235
< if (mod) {
---
> if (mod)
229,231c237,239
< return 0;
< } else
< return ENOENT;
---
> else
> error = ENOENT;
> goto done2;
235,236c243,246
< if (!mod)
< return ENOENT;
---
> if (mod == NULL) {
> error = ENOENT;
> goto done2;
> }
242c252,254
< return 0;
---
> done2:
> mtx_unlock(&Giant);
> return (error);
244a257,259
> /*
> * MPSAFE
> */
248a264
> int error;
252,254c268
< mod = module_lookupbyid(SCARG(uap, modid));
< if (!mod)
< return ENOENT;
---
> mtx_lock(&Giant);
256,260c270,281
< if (TAILQ_NEXT(mod, flink))
< p->p_retval[0] = TAILQ_NEXT(mod, flink)->id;
< else
< p->p_retval[0] = 0;
< return 0;
---
> mod = module_lookupbyid(SCARG(uap, modid));
> if (mod == NULL) {
> error = ENOENT;
> } else {
> error = 0;
> if (TAILQ_NEXT(mod, flink))
> p->p_retval[0] = TAILQ_NEXT(mod, flink)->id;
> else
> p->p_retval[0] = 0;
> }
> mtx_unlock(&Giant);
> return (error);
269a291,293
> /*
> * MPSAFE
> */
278a303,304
> mtx_lock(&Giant);
>
280,281c306,309
< if (!mod)
< return ENOENT;
---
> if (mod == NULL) {
> error = ENOENT;
> goto out;
> }
317a346
> mtx_unlock(&Giant);
320a350,352
> /*
> * MPSAFE
> */
330a363
> mtx_lock(&Giant);
332c365
< if (!mod)
---
> if (mod == NULL)
336c369
<
---
> mtx_unlock(&Giant);