xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / ipc / ipc_entry.c

diff --git a/osfmk/ipc/ipc_entry.c b/osfmk/ipc/ipc_entry.c
index e05803973ecf40d998226036c7c8194c6f792c25..4195a3acaf808f93e99b1f22035b0dfd7b65298d 100644 (file)
--- a/osfmk/ipc/ipc_entry.c
+++ b/osfmk/ipc/ipc_entry.c
@@ -223,34 +223,6 @@ ipc_entry_claim(
        return KERN_SUCCESS;
 }
 
-/*
- *     Routine:        ipc_entry_get
- *     Purpose:
- *             Tries to allocate an entry out of the space.
- *     Conditions:
- *             The space is write-locked and active throughout.
- *             An object may be locked.  Will not allocate memory.
- *     Returns:
- *             KERN_SUCCESS            A free entry was found.
- *             KERN_NO_SPACE           No entry allocated.
- */
-
-kern_return_t
-ipc_entry_get(
-       ipc_space_t             space,
-       mach_port_name_t        *namep,
-       ipc_entry_t             *entryp)
-{
-       kern_return_t kr;
-
-       kr = ipc_entries_hold(space, 1);
-       if (KERN_SUCCESS != kr) {
-               return kr;
-       }
-
-       return ipc_entry_claim(space, namep, entryp);
-}
-
 /*
  *     Routine:        ipc_entry_alloc
  *     Purpose:
@@ -281,9 +253,9 @@ ipc_entry_alloc(
                        return KERN_INVALID_TASK;
                }
 
-               kr = ipc_entry_get(space, namep, entryp);
+               kr = ipc_entries_hold(space, 1);
                if (kr == KERN_SUCCESS) {
-                       return kr;
+                       return ipc_entry_claim(space, namep, entryp);
                }
 
                kr = ipc_entry_grow_table(space, ITS_SIZE_NONE);
@@ -409,7 +381,6 @@ ipc_entry_alloc_name(
                 */
                kern_return_t kr;
                kr = ipc_entry_grow_table(space, index + 1);
-               assert(kr != KERN_NO_SPACE);
                if (kr != KERN_SUCCESS) {
                        /* space is unlocked */
                        return kr;