1 files changed, 6 insertions, 25 deletions
diff --git a/cpukit/posix/src/semdestroy.c b/cpukit/posix/src/semdestroy.c
index 8b81470bbf..61f5b1e80f 100644
--- a/cpukit/posix/src/semdestroy.c
+++ b/cpukit/posix/src/semdestroy.c
@@ -18,39 +18,20 @@
 #include "config.h"
 #endif
 
-#include <semaphore.h>
-
 #include <rtems/posix/semaphoreimpl.h>
 
-int sem_destroy(
-  sem_t *sem
-)
+int sem_destroy( sem_t *sem )
 {
-  POSIX_Semaphore_Control *the_semaphore;
-  Thread_queue_Context     queue_context;
-
-  _Objects_Allocator_lock();
-  the_semaphore = _POSIX_Semaphore_Get( sem, &queue_context );
+  POSIX_SEMAPHORE_VALIDATE_OBJECT( sem );
 
-  if ( the_semaphore == NULL ) {
-    _Objects_Allocator_unlock();
+  if ( _POSIX_Semaphore_Is_named( sem ) ) {
     rtems_set_errno_and_return_minus_one( EINVAL );
   }
 
-  _CORE_semaphore_Acquire_critical(
-    &the_semaphore->Semaphore,
-    &queue_context
-  );
-
-  if ( the_semaphore->named ) {
-    /* Undefined operation on a named semaphore */
-    _CORE_semaphore_Release( &the_semaphore->Semaphore, &queue_context );
-    _Objects_Allocator_unlock();
-    rtems_set_errno_and_return_minus_one( EINVAL );
+  if ( _POSIX_Semaphore_Is_busy( sem ) ) {
+    rtems_set_errno_and_return_minus_one( EBUSY );
   }
 
-  _POSIX_Semaphore_Delete( the_semaphore, &queue_context );
-
-  _Objects_Allocator_unlock();
+  _POSIX_Semaphore_Destroy( sem );
   return 0;
 }