|
@@ -162,6 +162,7 @@ struct lock * lock_create(const char * name)
|
|
|
|
|
|
if (lock->lk_name == NULL || wc == NULL)
|
|
if (lock->lk_name == NULL || wc == NULL)
|
|
{
|
|
{
|
|
|
|
+ kfree(lock->lk_name);
|
|
kfree(lock);
|
|
kfree(lock);
|
|
kfree(wc);
|
|
kfree(wc);
|
|
return NULL;
|
|
return NULL;
|
|
@@ -217,9 +218,7 @@ bool lock_do_i_hold(struct lock * lock)
|
|
{
|
|
{
|
|
KASSERT(lock);
|
|
KASSERT(lock);
|
|
|
|
|
|
- if (lock->owner == curthread) return 1;
|
|
|
|
-
|
|
|
|
- return 0;
|
|
|
|
|
|
+ return (lock->owner == curthread);
|
|
}
|
|
}
|
|
|
|
|
|
////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////////////////////////
|