diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index 7e6fe8d8ab2b..d865b58fb1fc 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -250,6 +250,7 @@ populate_shared_memory:
 			 * put error codes in downcall so that handle_io_error()
 			 * preserves it properly
 			 */
+			WARN_ON(!op_state_serviced(new_op));
 			new_op->downcall.status = ret;
 			handle_io_error();
 			goto out;
diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c
index cdbf57bef3eb..191d886ccc57 100644
--- a/fs/orangefs/waitqueue.c
+++ b/fs/orangefs/waitqueue.c
@@ -205,6 +205,7 @@ retry_servicing:
 
 		/* op uses shared memory */
 		if (orangefs_get_bufmap_init() == 0) {
+			WARN_ON(1);
 			/*
 			 * This operation uses the shared memory system AND
 			 * the system is not yet ready. This situation occurs