diff options
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/util.c | 16 | ||||
| -rw-r--r-- | ipc/util.h | 1 |
2 files changed, 0 insertions, 17 deletions
diff --git a/ipc/util.c b/ipc/util.c index 9f6aa30d2e0f..e829da9ed01f 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
| @@ -686,22 +686,6 @@ out: | |||
| 686 | return out; | 686 | return out; |
| 687 | } | 687 | } |
| 688 | 688 | ||
| 689 | struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id) | ||
| 690 | { | ||
| 691 | struct kern_ipc_perm *out; | ||
| 692 | |||
| 693 | out = ipc_lock(ids, id); | ||
| 694 | if (IS_ERR(out)) | ||
| 695 | return out; | ||
| 696 | |||
| 697 | if (ipc_checkid(out, id)) { | ||
| 698 | ipc_unlock(out); | ||
| 699 | return ERR_PTR(-EIDRM); | ||
| 700 | } | ||
| 701 | |||
| 702 | return out; | ||
| 703 | } | ||
| 704 | |||
| 705 | /** | 689 | /** |
| 706 | * ipcget - Common sys_*get() code | 690 | * ipcget - Common sys_*get() code |
| 707 | * @ns : namsepace | 691 | * @ns : namsepace |
diff --git a/ipc/util.h b/ipc/util.h index 14b0a2adba08..c5f3338ba1fa 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
| @@ -177,7 +177,6 @@ static inline void ipc_unlock(struct kern_ipc_perm *perm) | |||
| 177 | rcu_read_unlock(); | 177 | rcu_read_unlock(); |
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id); | ||
| 181 | struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id); | 180 | struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id); |
| 182 | int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids, | 181 | int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids, |
| 183 | struct ipc_ops *ops, struct ipc_params *params); | 182 | struct ipc_ops *ops, struct ipc_params *params); |
