From: Ralph Boehme Date: Thu, 27 Dec 2018 14:24:37 +0000 (+0100) Subject: Revert "smbd: explain that/why we use the raw tevent_context for lease_timeout_handler()" X-Git-Tag: talloc-2.1.15~153 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcb4723aacd165a3eb5d5bf3e9b68f444813f7f7;p=thirdparty%2Fsamba.git Revert "smbd: explain that/why we use the raw tevent_context for lease_timeout_handler()" This reverts commit 52f098d38da72d6eff3c4cac61487da897a8651c. See the discussion in https://lists.samba.org/archive/samba-technical/2018-December/131731.html for the reasoning behind this revert. Signed-off-by: Ralph Boehme Reviewed-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 64ca0d17585..31a36304310 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -354,11 +354,6 @@ static void lease_timeout_handler(struct tevent_context *ctx, struct share_mode_lock *lck; uint16_t old_epoch = lease->lease.lease_epoch; - /* - * This function runs without any specific impersonation - * and must not call any SMB_VFS operations! - */ - fsp = file_find_one_fsp_from_lease_key(lease->sconn, &lease->lease.lease_key); if (fsp == NULL) { @@ -454,12 +449,7 @@ bool fsp_lease_update(struct share_mode_lock *lck, DEBUG(10,("%s: setup timeout handler\n", __func__)); - /* - * lease_timeout_handler() only accesses locking.tdb - * so we don't use any impersonation and use - * the raw tevent context. - */ - lease->timeout = tevent_add_timer(lease->sconn->raw_ev_ctx, + lease->timeout = tevent_add_timer(lease->sconn->ev_ctx, lease, t, lease_timeout_handler, lease);