4 files changed, 11 insertions, 11 deletions

diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index f11c8375b1..47d61158c8 100644
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -966,8 +966,8 @@ static bool test_smb2_open_multi(struct torture_context *tctx,
 			break;
 		}
 
-		if (event_loop_once(tctx->ev) != 0) {
-			torture_comment(tctx, "event_loop_once failed\n");
+		if (tevent_loop_once(tctx->ev) != 0) {
+			torture_comment(tctx, "tevent_loop_once failed\n");
 			ret = false;
 			goto done;
 		}
diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c
index 348312657b..5bccf04f43 100644
--- a/source4/torture/smb2/lock.c
+++ b/source4/torture/smb2/lock.c
@@ -62,7 +62,7 @@
 
 #define WAIT_FOR_ASYNC_RESPONSE(req) \
 	while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) { \
-		if (event_loop_once(req->transport->socket->event.ctx) != 0) { \
+		if (tevent_loop_once(req->transport->socket->event.ctx) != 0) { \
 			break; \
 		} \
 	}
diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c
index 80c560be00..0f0e866098 100644
--- a/source4/torture/smb2/notify.c
+++ b/source4/torture/smb2/notify.c
@@ -101,7 +101,7 @@ static bool test_valid_request(struct torture_context *torture,
 	req = smb2_notify_send(tree, &n);
 
 	while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) {
-		if (event_loop_once(req->transport->socket->event.ctx) != 0) {
+		if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
 			break;
 		}
 	}
@@ -123,7 +123,7 @@ static bool test_valid_request(struct torture_context *torture,
 	req = smb2_notify_send(tree, &n);
 
 	while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) {
-		if (event_loop_once(req->transport->socket->event.ctx) != 0) {
+		if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
 			break;
 		}
 	}
@@ -142,7 +142,7 @@ static bool test_valid_request(struct torture_context *torture,
 	req = smb2_notify_send(tree, &n);
 
 	while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) {
-		if (event_loop_once(req->transport->socket->event.ctx) != 0) {
+		if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
 			break;
 		}
 	}
@@ -174,7 +174,7 @@ static bool test_valid_request(struct torture_context *torture,
 	req = smb2_notify_send(tree, &n);
 
 	while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) {
-		if (event_loop_once(req->transport->socket->event.ctx) != 0) {
+		if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
 			break;
 		}
 	}
@@ -188,7 +188,7 @@ static bool test_valid_request(struct torture_context *torture,
 	n.in.buffer_size        = max_buffer_size;
 	req = smb2_notify_send(tree, &n);
 	while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) {
-		if (event_loop_once(req->transport->socket->event.ctx) != 0) {
+		if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
 			break;
 		}
 	}
diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c
index eeea03639a..2d74c5d1f4 100644
--- a/source4/torture/smb2/oplock.c
+++ b/source4/torture/smb2/oplock.c
@@ -329,7 +329,7 @@ static void torture_wait_for_oplock_break(struct torture_context *tctx)
 	/* Wait .1 seconds for an oplock break */
 	ne = tevent_timeval_current_ofs(0, 100000);
 
-	if ((te = event_add_timed(tctx->ev, tmp_ctx, ne, timeout_cb, &timesup))
+	if ((te = tevent_add_timer(tctx->ev, tmp_ctx, ne, timeout_cb, &timesup))
 	    == NULL)
 	{
 		torture_comment(tctx, "Failed to wait for an oplock break. "
@@ -338,7 +338,7 @@ static void torture_wait_for_oplock_break(struct torture_context *tctx)
 	}
 
 	while (!timesup && break_info.count < old_count + 1) {
-		if (event_loop_once(tctx->ev) != 0) {
+		if (tevent_loop_once(tctx->ev) != 0) {
 			torture_comment(tctx, "Failed to wait for an oplock "
 					      "break. test results may not be "
 					      "accurate.");
@@ -3606,7 +3606,7 @@ bool test_smb2_hold_oplock(struct torture_context *tctx,
 	}
 
 	torture_comment(tctx, "Waiting for oplock events\n");
-	event_loop_wait(ev);
+	tevent_loop_wait(ev);
 	smb2_deltree(tree, BASEDIR);
 	talloc_free(mem_ctx);
 	return true;