1 files changed, 6 insertions, 3 deletions

diff --git a/ot_fdstate.c b/ot_fdstate.c
index 7d742da..09daf50 100644
--- a/ot_fdstate.c
+++ b/ot_fdstate.c
@@ -91,7 +91,7 @@ uint32_t fdstate_open(int fd, void *cookie, ot_time expiry) {
   }
 
   word = atomic_load_explicit(&slot->state, memory_order_relaxed);
-  atomic_store_explicit(&slot->cookie, cookie, memory_order_relaxed);
+  atomic_store_explicit(&slot->cookie, cookie, memory_order_release);
   atomic_store_explicit(&slot->expiry, expiry, memory_order_relaxed);
   /* Publishes the two above to whoever claims the slot next */
   atomic_store_explicit(&slot->state, FD_WORD(FD_GEN(word), FD_IDLE), memory_order_release);
@@ -183,14 +183,17 @@ int fdstate_next_expired(ot_time now, int *cursor) {
 void *fdstate_cookie(int fd) {
   ot_fdslot *slot = fdstate_slot(fd);
 
-  return slot ? atomic_load_explicit(&slot->cookie, memory_order_relaxed) : NULL;
+  /* Pairs with the release in fdstate_set_cookie and fdstate_open */
+  return slot ? atomic_load_explicit(&slot->cookie, memory_order_acquire) : NULL;
 }
 
 void fdstate_set_cookie(int fd, void *cookie) {
   ot_fdslot *slot = fdstate_slot(fd);
 
+  /* Publishes what the cookie points at to whoever reads it next, which may
+     be another thread entirely */
   if (slot)
-    atomic_store_explicit(&slot->cookie, cookie, memory_order_relaxed);
+    atomic_store_explicit(&slot->cookie, cookie, memory_order_release);
 }
 
 void fdstate_set_expiry(int fd, ot_time expiry) {