|
@@ -286,7 +286,7 @@ int ipc_addid(struct ipc_ids* ids, struct kern_ipc_perm* new, int size)
|
|
|
idr_preload(GFP_KERNEL);
|
|
|
|
|
|
spin_lock_init(&new->lock);
|
|
|
- new->deleted = 0;
|
|
|
+ new->deleted = false;
|
|
|
rcu_read_lock();
|
|
|
spin_lock(&new->lock);
|
|
|
|
|
@@ -447,7 +447,7 @@ void ipc_rmid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp)
|
|
|
|
|
|
ids->in_use--;
|
|
|
|
|
|
- ipcp->deleted = 1;
|
|
|
+ ipcp->deleted = true;
|
|
|
|
|
|
return;
|
|
|
}
|
|
@@ -657,7 +657,7 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id)
|
|
|
/* ipc_rmid() may have already freed the ID while ipc_lock
|
|
|
* was spinning: here verify that the structure is still valid
|
|
|
*/
|
|
|
- if (!out->deleted)
|
|
|
+ if (ipc_valid_object(out))
|
|
|
return out;
|
|
|
|
|
|
spin_unlock(&out->lock);
|