Skip to content

Commit

Permalink
Revert "DAOS-16931 container: fix oid iv race with using invalid on u…
Browse files Browse the repository at this point in the history
…pdate pt…"

This reverts commit 6dda9d7.
  • Loading branch information
mchaarawi authored Jan 20, 2025
1 parent 0be2d10 commit 9306c32
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/container/oid_iv.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/**
* (C) Copyright 2017-2024 Intel Corporation.

Check failure on line 2 in src/container/oid_iv.c

View workflow job for this annotation

GitHub Actions / Copyright check

Copyright out of date
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -134,10 +133,10 @@ oid_iv_ent_update(struct ds_iv_entry *ns_entry, struct ds_iv_key *iv_key,
entry = ns_entry->iv_value.sg_iovs[0].iov_buf;
rc = ABT_mutex_trylock(entry->lock);
/** For retry requests, from _iv_op(), the lock may not be released in some cases. */
if (rc == ABT_ERR_MUTEX_LOCKED && entry->current_req != priv)
if (rc == ABT_ERR_MUTEX_LOCKED && entry->current_req != src)
return -DER_BUSY;

entry->current_req = priv;
entry->current_req = src;
avail = &entry->rg;

oids = src->sg_iovs[0].iov_buf;
Expand Down

0 comments on commit 9306c32

Please sign in to comment.