1 files changed, 22 insertions, 24 deletions

diff --git a/lib9p/tests/test_server/fs_flush.c b/lib9p/tests/test_server/fs_flush.c
index e6408d7..63a52af 100644
--- a/lib9p/tests/test_server/fs_flush.c
+++ b/lib9p/tests/test_server/fs_flush.c
@@ -31,10 +31,10 @@ static struct lib9p_qid flush_file_qid(struct flush_file *self) {
 	};
 }
 
-static struct lib9p_srv_stat flush_file_stat(struct flush_file *self, struct lib9p_srv_ctx *ctx) {
+static lib9p_srv_stat_or_error flush_file_stat(struct flush_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
-	return (struct lib9p_srv_stat){
+	return ERROR_NEW_VAL(lib9p_srv_stat, ((struct lib9p_srv_stat){
 		.qid                 = flush_file_qid(self),
 		.mode                = 0444,
 		.atime_sec           = UTIL9P_ATIME,
@@ -45,29 +45,29 @@ static struct lib9p_srv_stat flush_file_stat(struct flush_file *self, struct lib
 		.owner_gid           = { .name = lib9p_str("root"), .num = 0 },
 		.last_modifier_uid   = { .name = lib9p_str("root"), .num = 0 },
 		.extension           = lib9p_str(NULL),
-	};
+	}));
 }
-static void flush_file_wstat(struct flush_file *self, struct lib9p_srv_ctx *ctx, struct lib9p_srv_stat) {
+static error flush_file_wstat(struct flush_file *self, struct lib9p_srv_ctx *ctx, struct lib9p_srv_stat) {
 	assert(self);
 	assert(ctx);
-	lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_EROFS, "cannot wstat API file");
+	return error_new(E_POSIX_EROFS, "cannot wstat API file");
 }
-static void flush_file_remove(struct flush_file *self, struct lib9p_srv_ctx *ctx) {
+static error flush_file_remove(struct flush_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
-	lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_EROFS, "cannot remove API file");
+	return error_new(E_POSIX_EROFS, "cannot remove API file");
 }
 
-LIB9P_SRV_NOTDIR(struct flush_file, flush_file)
+LIB9P_SRV_NOTDIR(struct flush_file, flush_file);
 
-static lo_interface lib9p_srv_fio flush_file_fopen(struct flush_file *self, struct lib9p_srv_ctx *ctx, bool, bool, bool) {
+static lib9p_srv_fio_or_error flush_file_fopen(struct flush_file *self, struct lib9p_srv_ctx *ctx, bool, bool, bool) {
 	assert(self);
 	assert(ctx);
 
 	struct flush_fio *ret = heap_alloc(1, struct flush_fio);
 	ret->parent = self;
 
-	return lo_box_flush_fio_as_lib9p_srv_fio(ret);
+	return ERROR_NEW_VAL(lib9p_srv_fio, LO_BOX(lib9p_srv_fio, ret));
 }
 
 /* srv_fio ********************************************************************/
@@ -87,19 +87,17 @@ static uint32_t flush_fio_iounit(struct flush_fio *self) {
 	return 0;
 }
 
-static uint32_t flush_fio_pwrite(struct flush_fio *LM_UNUSED(self),
+static uint32_t_or_error flush_fio_pwrite(struct flush_fio *LM_UNUSED(self),
                                  struct lib9p_srv_ctx *LM_UNUSED(ctx),
                                  void *LM_UNUSED(buf), uint32_t LM_UNUSED(byte_count),
                                  uint64_t LM_UNUSED(offset)) {
 	assert_notreached("not writable");
 }
 
-static void flush_fio_pread(struct flush_fio *self, struct lib9p_srv_ctx *ctx,
-                            uint32_t byte_count, uint64_t LM_UNUSED(byte_offset),
-                            struct iovec *ret) {
+static iovec_or_error flush_fio_pread(struct flush_fio *self, struct lib9p_srv_ctx *ctx,
+                            uint32_t byte_count, uint64_t LM_UNUSED(byte_offset)) {
 	assert(self);
 	assert(ctx);
-	assert(ret);
 
 	/* Wait for first Tflush */
 	while (!lib9p_srv_flush_requested(ctx))
@@ -111,21 +109,21 @@ static void flush_fio_pread(struct flush_fio *self, struct lib9p_srv_ctx *ctx,
 	while (cr_chan_num_waiters(&ctx->flush_ch) != self->parent->flush_cnt)
 		cr_yield();
 
+	/* Yield one more time, just because.  */
+	cr_yield();
+
 	/* Return */
 	switch (self->parent->flush_behavior) {
 	case FLUSH_READ:
-		*ret = (struct iovec){
+		return ERROR_NEW_VAL(iovec, ((struct iovec){
 			.iov_base = "Sloth\n",
 			.iov_len = 6 < byte_count ? 6 : byte_count,
-		};
-		break;
+		}));
 	case FLUSH_ERROR:
-		lib9p_srv_acknowledge_flush(ctx);
-		lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_ECANCELED, "request canceled by flush");
-		break;
+		return ERROR_NEW_ERR(iovec, error_new(E_POSIX_EAGAIN, "request canceled by flush"));
 	case FLUSH_SILENT:
-		lib9p_srv_acknowledge_flush(ctx);
-		break;
+		return ERROR_NEW_ERR(iovec, error_new(E_POSIX_ECANCELED, "request canceled by flush"));
+	default:
+		assert_notreached("invalid flush_behavior");
 	}
-	cr_yield();
 }