DAOS-13786 client: pool_free take rdlock for dp_co_list check

Cherry-pick of to release/2.4 branch, a fix for Coverity CID 1444801 Required-githooks: true Signed-off-by: Kenneth Cain <kenneth.c.cain@intel.com>
daos-stack · Jun 21, 2023 · 3f0737b · 3f0737b
1 parent 702c989
commit 3f0737b
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 10 deletions.
diff --git a/src/cart/crt_self_test_client.c b/src/cart/crt_self_test_client.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2016-2022 Intel Corporation.
+ * (C) Copyright 2016-2023 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */

diff --git a/src/client/kv/dc_kv.c b/src/client/kv/dc_kv.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2017-2022 Intel Corporation.
+ * (C) Copyright 2017-2023 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */

diff --git a/src/control/cmd/daos_agent/fabric.go b/src/control/cmd/daos_agent/fabric.go
@@ -1,5 +1,5 @@
 //
-// (C) Copyright 2021-2022 Intel Corporation.
+// (C) Copyright 2021-2023 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 //

diff --git a/src/control/lib/spdk/spdk.go b/src/control/lib/spdk/spdk.go
@@ -1,5 +1,5 @@
 //
-// (C) Copyright 2018-2022 Intel Corporation.
+// (C) Copyright 2018-2023 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 //

diff --git a/src/control/lib/spdk/spdk_default.go b/src/control/lib/spdk/spdk_default.go
@@ -1,5 +1,5 @@
 //
-// (C) Copyright 2022 Intel Corporation.
+// (C) Copyright 2022-2023 Intel Corporation.
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 //

diff --git a/src/gurt/dlog.c b/src/gurt/dlog.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2016-2022 Intel Corporation.
+ * (C) Copyright 2016-2023 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */

diff --git a/src/pool/cli.c b/src/pool/cli.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2016-2022 Intel Corporation.
+ * (C) Copyright 2016-2023 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -87,10 +87,14 @@ pool_free(struct d_hlink *hlink)
 
 	pool = container_of(hlink, struct dc_pool, dp_hlink);
 	D_ASSERT(daos_hhash_link_empty(&pool->dp_hlink));
+
+	D_RWLOCK_RDLOCK(&pool->dp_co_list_lock);
+	D_ASSERT(d_list_empty(&pool->dp_co_list));
+	D_RWLOCK_UNLOCK(&pool->dp_co_list_lock);
+
 	D_RWLOCK_DESTROY(&pool->dp_map_lock);
 	D_MUTEX_DESTROY(&pool->dp_client_lock);
 	D_RWLOCK_DESTROY(&pool->dp_co_list_lock);
-	D_ASSERT(d_list_empty(&pool->dp_co_list));
 
 	if (pool->dp_map != NULL)
 		pool_map_decref(pool->dp_map);

diff --git a/src/tests/ftest/datamover/serial_small.py b/src/tests/ftest/datamover/serial_small.py
@@ -1,5 +1,5 @@
 '''
-  (C) Copyright 2020-2022 Intel Corporation.
+  (C) Copyright 2020-2023 Intel Corporation.
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 '''

diff --git a/src/tests/suite/daos_kv.c b/src/tests/suite/daos_kv.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2016-2022 Intel Corporation.
+ * (C) Copyright 2016-2023 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */