diff options
| author | Volker Lendecke <vl@samba.org> | 2016-07-13 07:27:30 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2016-07-15 16:56:13 +0200 |
| commit | 83e4e1a78645011f4cf527f0eb1a5b0f7a815f97 (patch) | |
| tree | 5281284f6f7dbfe1c2f9829f71bc6afd705df05a /source3/smbd | |
| parent | db22df41727ce6e9d778307f4137652820b984e1 (diff) | |
| download | samba-83e4e1a78645011f4cf527f0eb1a5b0f7a815f97.tar.gz | |
smbd: Convert locking.tdb to new dbwrap_watch
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/open.c | 8 | ||||
| -rw-r--r-- | source3/smbd/smb2_setinfo.c | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 57cd4f1c1af..ab46fe0a20b 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1952,9 +1952,9 @@ static void defer_open(struct share_mode_lock *lck, DEBUG(10, ("defering mid %llu\n", (unsigned long long)req->mid)); - watch_req = dbwrap_record_watch_send( + watch_req = dbwrap_watched_watch_send( watch_state, req->sconn->ev_ctx, lck->data->record, - req->sconn->msg_ctx, (struct server_id){0}); + (struct server_id){0}); if (watch_req == NULL) { exit_server("Could not watch share mode record"); } @@ -1981,11 +1981,11 @@ static void defer_open_done(struct tevent_req *req) NTSTATUS status; bool ret; - status = dbwrap_record_watch_recv(req, talloc_tos(), NULL, NULL, + status = dbwrap_watched_watch_recv(req, talloc_tos(), NULL, NULL, NULL); TALLOC_FREE(req); if (!NT_STATUS_IS_OK(status)) { - DEBUG(5, ("dbwrap_record_watch_recv returned %s\n", + DEBUG(5, ("dbwrap_watched_watch_recv returned %s\n", nt_errstr(status))); /* * Even if it failed, retry anyway. TODO: We need a way to diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c index 0a678ea0488..db00ba0f672 100644 --- a/source3/smbd/smb2_setinfo.c +++ b/source3/smbd/smb2_setinfo.c @@ -248,11 +248,10 @@ static struct tevent_req *delay_rename_for_lease_break(struct tevent_req *req, talloc_set_destructor(rename_state, defer_rename_state_destructor); - subreq = dbwrap_record_watch_send( + subreq = dbwrap_watched_watch_send( rename_state, ev, lck->data->record, - fsp->conn->sconn->msg_ctx, (struct server_id){0}); if (subreq == NULL) { @@ -280,8 +279,8 @@ static void defer_rename_done(struct tevent_req *subreq) int ret_size = 0; bool ok; - status = dbwrap_record_watch_recv(subreq, state->req, NULL, NULL, - NULL); + status = dbwrap_watched_watch_recv(subreq, state->req, NULL, NULL, + NULL); TALLOC_FREE(subreq); if (!NT_STATUS_IS_OK(status)) { DEBUG(5, ("dbwrap_record_watch_recv returned %s\n", |