more complete patch from GNOME BZ#667230

https://bugzilla.gnome.org/show_bug.cgi?id=667230

diff --git a/double-lock.patch b/double-lock.patch
index 9a309c694375f3ecc60781cfacc153250edb5128..6c6cbe02e1d41c8230a5fdaf2e605fdec725dab3 100644 (file)
--- a/double-lock.patch
+++ b/double-lock.patch
@@ -1,24 +1,47 @@
 gam_server deadlocks, leading to all KDE applications hanging at start
 https://bugzilla.redhat.com/show_bug.cgi?id=786170
+https://bugzilla.gnome.org/show_bug.cgi?id=667230
 
 Also happens to lock courier-imapd processes in pld linux
 
-From 50df2c4de7b3aa8bed8781c92afb9a635a01df3f Mon Sep 17 00:00:00 2001
-From: Sandro Mani <manisandro@gmail.com>
-Date: Fri, 3 Feb 2012 09:10:21 +0100
-Subject: [PATCH] Fix double lock
-
+also
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
 https://bugzilla.gnome.org/show_bug.cgi?id=669292
+
+From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi@mageia.org>
+Date: Wed, 4 Jan 2012 00:23:55 +0200
+Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
+
+ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
+However, ih_sub_cancel() locks it again, and locking GMutex recursively
+causes undefined behaviour.
+
+Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
+is its only user. Also make the function static so that it won't
+accidentally get used by other files without locking (inotify-helper.h
+is an internal server header).
+
+This should fix the intermittent deadlocks I've been experiencing
+causing KDE applications to no longer start, and probably also
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
 ---
- server/inotify-helper.c |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
+ server/inotify-helper.c |    7 ++-----
+ server/inotify-helper.h |    1 -
+ 2 files changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/server/inotify-helper.c b/server/inotify-helper.c
-index d77203e..defa7c6 100644
+index d77203e..0789fa4 100644
 --- a/server/inotify-helper.c
 +++ b/server/inotify-helper.c
-@@ -127,9 +127,6 @@ ih_sub_add (ih_sub_t * sub)
- gboolean
+@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
+ 
+ /**
+  * Cancels a subscription which was being monitored.
++ * inotify_lock must be held when calling.
+  */
+-gboolean
++static gboolean
  ih_sub_cancel (ih_sub_t * sub)
  {
 -      G_LOCK(inotify_lock);
@@ -27,7 +50,7 @@ index d77203e..defa7c6 100644
        if (!sub->cancelled)
        {
                IH_W("cancelling %s\n", sub->pathname);
-@@ -140,7 +137,6 @@ ih_sub_cancel (ih_sub_t * sub)
+@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
                sub_list = g_list_remove (sub_list, sub);
        }
  
@@ -35,6 +58,18 @@ index d77203e..defa7c6 100644
        return TRUE;
  }
  
+diff --git a/server/inotify-helper.h b/server/inotify-helper.h
+index 5d3b6d0..d36b5fd 100644
+--- a/server/inotify-helper.h
++++ b/server/inotify-helper.h
+@@ -34,7 +34,6 @@ gboolean      ih_startup             (event_callback_t ecb,
+                                        found_callback_t fcb);
+ gboolean       ih_running             (void);
+ gboolean       ih_sub_add             (ih_sub_t *sub);
+-gboolean       ih_sub_cancel          (ih_sub_t *sub);
+ 
+ /* Return FALSE from 'f' if the subscription should be cancelled */
+ void           ih_sub_foreach         (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
 -- 
-1.7.9
+1.7.7.2