rbtree: Do not set node off-tree in extract

3 files changed, 14 insertions, 9 deletions

diff --git a/cpukit/score/include/rtems/score/rbtree.h b/cpukit/score/include/rtems/score/rbtree.h
index 7c88326ba4..b3f2ed4c0d 100644
--- a/cpukit/score/include/rtems/score/rbtree.h
+++ b/cpukit/score/include/rtems/score/rbtree.h
@@ -241,9 +241,16 @@ RBTree_Node *_RBTree_Insert(
 );
 
 /**
- *  @brief Extracts (removes) @a the_node from @a the_rbtree.
+ * @brief Extracts (removes) the node from the red-black tree.
  *
- *  This routine extracts (removes) @a the_node from @a the_rbtree.
+ * This function does not set the node off-tree.  In case this is desired, then
+ * call _RBTree_Set_off_rbtree() after the extraction.
+ *
+ * In case the node to extract is not a node of the tree, then this function
+ * yields unpredictable results.
+ *
+ * @param[in] the_rbtree The red-black tree control.
+ * @param[in] the_node The node to extract.
  */
 void _RBTree_Extract(
   RBTree_Control *the_rbtree,
diff --git a/cpukit/score/src/rbtreeextract.c b/cpukit/score/src/rbtreeextract.c
index 0ea805bd59..a1896a960e 100644
--- a/cpukit/score/src/rbtreeextract.c
+++ b/cpukit/score/src/rbtreeextract.c
@@ -202,9 +202,6 @@ void _RBTree_Extract(
     }
   }
 
-  /* Wipe the_node */
-  _RBTree_Set_off_rbtree( the_node );
-
   /* set root to black, if it exists */
   if ( the_rbtree->root )
     the_rbtree->root->color = RBT_BLACK;
diff --git a/testsuites/sptests/sprbtree01/init.c b/testsuites/sptests/sprbtree01/init.c
index ca790959cd..956271b325 100644
--- a/testsuites/sptests/sprbtree01/init.c
+++ b/testsuites/sptests/sprbtree01/init.c
@@ -140,6 +140,9 @@ rtems_task Init(
   puts( "Init - Initialize rbtree empty" );
   rtems_rbtree_initialize_empty( &rbtree1 );
 
+  rtems_rbtree_set_off_rbtree( &node1.Node );
+  rtems_test_assert( rtems_rbtree_is_node_off_rbtree( &node1.Node ) );
+
   /* verify that the rbtree insert work */
   puts( "INIT - Verify rtems_rbtree_insert with two nodes" );
   node1.id = 1;
@@ -149,6 +152,7 @@ rtems_task Init(
   rb_insert_unique( &rbtree1, &node1.Node );
   rb_insert_unique( &rbtree1, &node2.Node );
 
+  rtems_test_assert( !rtems_rbtree_is_node_off_rbtree( &node1.Node ) );
 
   _RBTree_Rotate(NULL, RBT_LEFT);
   i = (node1.Node.parent == &node2.Node);
@@ -261,6 +265,7 @@ rtems_task Init(
     puts( "INIT - rtems_rbtree_extract failed");
     rtems_test_exit(0);
   }
+  rtems_test_assert( !rtems_rbtree_is_node_off_rbtree( p ) );
   rb_insert_unique(&rbtree1, p);
 
   for ( p = rtems_rbtree_get_min(&rbtree1), id = 1 ; p ;
@@ -520,10 +525,6 @@ rtems_task Init(
     rtems_test_exit(0);
   }
 
-  if (rtems_rbtree_find_header(&node_array[0].Node) != NULL) {
-    puts ("INIT - ERROR ON RBTREE HEADER MISMATCH");
-    rtems_test_exit(0);
-  }
   if (rtems_rbtree_find_header(NULL) != NULL) {
     puts ("INIT - ERROR ON RBTREE HEADER MISMATCH");
     rtems_test_exit(0);