From a15ec8d1cbefde9b8176f33ede165329bbf989e8 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Tue, 1 May 2018 09:53:36 +0200 Subject: [PATCH] s3:cleanupd: sends MSG_SMB_UNLOCK twice to interested peers MSG_SMB_UNLOCK should be send to smbd that are waiting on blocked byte-range-locks when a lock holder died. In smbd_cleanupd_unlock() we do this twice: once via a broadcast and then again via brl_revalidate() to processes that are actually recorded in brlock.tdb. As brl_revalidate() should already take care of signaling anyone who would be interested in the message, there's no need to broadcast. Bug: https://bugzilla.samba.org/show_bug.cgi?id=13416 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri May 4 03:02:28 CEST 2018 on sn-devel-144 (cherry picked from commit 53ff08a2cf838c0f1c3f050ac2aa13fc3acc5981) --- source3/smbd/smbd_cleanupd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/source3/smbd/smbd_cleanupd.c b/source3/smbd/smbd_cleanupd.c index a9b1e8a1137..6ed87207925 100644 --- a/source3/smbd/smbd_cleanupd.c +++ b/source3/smbd/smbd_cleanupd.c @@ -98,8 +98,6 @@ static void smbd_cleanupd_unlock(struct messaging_context *msg, DBG_WARNING("Cleaning up brl and lock database after unclean " "shutdown\n"); - messaging_send_all(msg, MSG_SMB_UNLOCK, NULL, 0); - brl_revalidate(msg, private_data, msg_type, server_id, data); } -- 2.17.0.441.gb46fe60e1d-goog