diff options
| -rw-r--r-- | include/linux/ipc.h | 2 | ||||
| -rw-r--r-- | ipc/sem.c | 2 | ||||
| -rw-r--r-- | ipc/util.c | 6 | ||||
| -rw-r--r-- | ipc/util.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/ipc.h b/include/linux/ipc.h index 8d861b2651f..9d84942ae2e 100644 --- a/include/linux/ipc.h +++ b/include/linux/ipc.h @@ -11,7 +11,7 @@ struct kern_ipc_perm { spinlock_t lock; - int deleted; + bool deleted; int id; key_t key; kuid_t uid; diff --git a/ipc/sem.c b/ipc/sem.c index 4d88194a5ff..160fbb3390b 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -394,7 +394,7 @@ static inline struct sem_array *sem_obtain_lock(struct ipc_namespace *ns, /* ipc_rmid() may have already freed the ID while sem_lock * was spinning: verify that the structure is still valid */ - if (!ipcp->deleted) + if (ipc_valid_object(ipcp)) return container_of(ipcp, struct sem_array, sem_perm); sem_unlock(sma, *locknum); diff --git a/ipc/util.c b/ipc/util.c index 3ae17a4ace5..9dc67fa4308 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -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); diff --git a/ipc/util.h b/ipc/util.h index d05b7085a88..a1cbc3aaf25 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -195,7 +195,7 @@ static inline void ipc_unlock(struct kern_ipc_perm *perm) */ static inline bool ipc_valid_object(struct kern_ipc_perm *perm) { - return perm->deleted == 0; + return !perm->deleted; } struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id); |