From cc4970cf9426ae4c929ccd859585a29fb9d243c8 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Wed, 23 Sep 2009 18:39:45 +0200 Subject: [PATCH] Fall back to inotify_init if inotify_init1 does not work This fixes monitoring failing to work when glib is built on a 2.6.27+ kernel but run on an older one. http://bugs.debian.org/544354 https://bugzilla.gnome.org/show_bug.cgi?id=593775 --- gio/inotify/inotify-kernel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gio/inotify/inotify-kernel.c b/gio/inotify/inotify-kernel.c index b0b85ae4b..6e559a7b8 100644 --- a/gio/inotify/inotify-kernel.c +++ b/gio/inotify/inotify-kernel.c @@ -193,8 +193,10 @@ gboolean _ik_startup (void (*cb)(ik_event_t *event)) #ifdef HAVE_INOTIFY_INIT1 inotify_instance_fd = inotify_init1 (IN_CLOEXEC); #else - inotify_instance_fd = inotify_init (); + inotify_instance_fd = -1; #endif + if (inotify_instance_fd < 0) + inotify_instance_fd = inotify_init (); if (inotify_instance_fd < 0) return FALSE;