Commit 5b284be46733010b15406e15e61871cc1c30dd5e
Committed by
Greg Kroah-Hartman
1 parent
c7f0866bc7
ipc: drop ipc_lock_check
commit 20b8875abcf2daa1dda5cf70bd6369df5e85d4c1 upstream. No remaining users, we now use ipc_obtain_object_check(). Signed-off-by: Davidlohr Bueso <davidlohr.bueso@hp.com> Cc: Sedat Dilek <sedat.dilek@gmail.com> Cc: Rik van Riel <riel@redhat.com> Cc: Manfred Spraul <manfred@colorfullife.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing 2 changed files with 0 additions and 17 deletions Side-by-side Diff
ipc/util.c
... | ... | @@ -678,22 +678,6 @@ |
678 | 678 | return out; |
679 | 679 | } |
680 | 680 | |
681 | -struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id) | |
682 | -{ | |
683 | - struct kern_ipc_perm *out; | |
684 | - | |
685 | - out = ipc_lock(ids, id); | |
686 | - if (IS_ERR(out)) | |
687 | - return out; | |
688 | - | |
689 | - if (ipc_checkid(out, id)) { | |
690 | - ipc_unlock(out); | |
691 | - return ERR_PTR(-EIDRM); | |
692 | - } | |
693 | - | |
694 | - return out; | |
695 | -} | |
696 | - | |
697 | 681 | /** |
698 | 682 | * ipcget - Common sys_*get() code |
699 | 683 | * @ns : namsepace |
ipc/util.h
... | ... | @@ -185,7 +185,6 @@ |
185 | 185 | rcu_read_unlock(); |
186 | 186 | } |
187 | 187 | |
188 | -struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id); | |
189 | 188 | struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id); |
190 | 189 | int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids, |
191 | 190 | struct ipc_ops *ops, struct ipc_params *params); |