[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - wsd/LOOLWSD.cpp

[Jan Holesovsky]

 wsd/LOOLWSD.cpp |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit ecba38d06b11e406241a451416c1193dfbc4459d
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Dec 1 12:32:26 2016 +0100

    Revert "loolwsd: alertAllUsersInternal expects lock to be taken"
    
    Unfortunately this brings back the deadlock that
    51c88c5fb79c5db146a08f5ef2d9a4fe6d095caa fixed :-(
    
    This reverts commit da3b1b208aefc734c856492db1078e1804702b4e.
    
    Change-Id: If48c0b3ddebf3fb366786d90cb35c3c22963b1a1
    Reviewed-on: https://gerrit.libreoffice.org/31482
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f433637..6b143a4 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -291,8 +291,6 @@ static void forkChildren(const int number)
         if (!fs.empty())
         {
             LOG_WRN("File system of " << fs << " dangerously low on disk space");
-
-            std::unique_lock<std::mutex> DocBrokersLock(DocBrokersMutex);
             alertAllUsersInternal("error: cmd=internal kind=diskfull");
         }