X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fsvm%2Fsvm_fifo_segment.c;h=e377160f6d821f1b67c44a8c7f1bbf0cbf068609;hb=c5df8c71c;hp=6897e0c2d51b719895e321d43a81571567a4731b;hpb=d9818dd68c162079f3ddb5443a78d0d91d55d0fe;p=vpp.git

diff --git a/src/svm/svm_fifo_segment.c b/src/svm/svm_fifo_segment.c
index 6897e0c2d51..e377160f6d8 100644
--- a/src/svm/svm_fifo_segment.c
+++ b/src/svm/svm_fifo_segment.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -370,10 +370,6 @@ svm_fifo_segment_alloc_fifo (svm_fifo_segment_private_t * fs,
       f = fsh->free_fifos[freelist_index];
       if (PREDICT_FALSE (!f))
 	{
-	  /* Preallocated and no fifo left. Don't even try */
-	  if (fsh->flags & FIFO_SEGMENT_F_IS_PREALLOCATED)
-	    goto done;
-
 	  oldheap = ssvm_push_heap (sh);
 	  allocate_new_fifo_chunk (fsh, data_size_in_bytes,
 				   FIFO_SEGMENT_ALLOC_CHUNK_SIZE);
@@ -437,7 +433,6 @@ svm_fifo_segment_free_fifo (svm_fifo_segment_private_t * s, svm_fifo_t * f,
 {
   ssvm_shared_header_t *sh;
   svm_fifo_segment_header_t *fsh;
-  void *oldheap;
   int freelist_index;
 
   ASSERT (f->refcnt > 0);
@@ -453,7 +448,6 @@ svm_fifo_segment_free_fifo (svm_fifo_segment_private_t * s, svm_fifo_t * f,
   ASSERT (freelist_index < vec_len (fsh->free_fifos));
 
   ssvm_lock_non_recursive (sh, 2);
-  oldheap = ssvm_push_heap (sh);
 
   switch (list_index)
     {
@@ -487,7 +481,6 @@ svm_fifo_segment_free_fifo (svm_fifo_segment_private_t * s, svm_fifo_t * f,
     }
 
   fsh->n_active_fifos--;
-  ssvm_pop_heap (oldheap);
   ssvm_unlock_non_recursive (sh);
 }