diff options
| author | Davidlohr Bueso <davidlohr.bueso@hp.com> | 2013-09-11 14:26:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-18 07:45:48 -0700 |
| commit | c42107e68217f062e4257f0505a8c5b24b6cb9f3 (patch) | |
| tree | 867aa815278d42da9c2fb14f78daae0ad213d97c /ipc | |
| parent | 1129a4810a2499dd02a7bfa657053c55c35140a3 (diff) | |
| download | linux-3.10-c42107e68217f062e4257f0505a8c5b24b6cb9f3.tar.gz linux-3.10-c42107e68217f062e4257f0505a8c5b24b6cb9f3.tar.bz2 linux-3.10-c42107e68217f062e4257f0505a8c5b24b6cb9f3.zip | |
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>
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 9f6aa30d2e0..e829da9ed01 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -686,22 +686,6 @@ out: return out; } -struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id) -{ - struct kern_ipc_perm *out; - - out = ipc_lock(ids, id); - if (IS_ERR(out)) - return out; - - if (ipc_checkid(out, id)) { - ipc_unlock(out); - return ERR_PTR(-EIDRM); - } - - return out; -} - /** * ipcget - Common sys_*get() code * @ns : namsepace diff --git a/ipc/util.h b/ipc/util.h index 14b0a2adba0..c5f3338ba1f 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -177,7 +177,6 @@ static inline void ipc_unlock(struct kern_ipc_perm *perm) rcu_read_unlock(); } -struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id); struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id); int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids, struct ipc_ops *ops, struct ipc_params *params); |