From f5c1381e065bfab1903eebd7596f670b82c28509 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Tue, 28 Mar 2006 17:58:07 +0900 Subject: [PATCH] server: Fix a race condition in the delivery of change notifications. --- server/change.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/change.c b/server/change.c index 4349d7e3876..eec124148bd 100644 --- a/server/change.c +++ b/server/change.c @@ -591,11 +591,6 @@ static void inotify_do_change_notify( struct dir *dir, unsigned int action, if (!list_empty( &dir->change_q )) async_terminate_head( &dir->change_q, STATUS_ALERTED ); - else - { - dir->signaled++; - dir_signal_changed( dir ); - } } static unsigned int filter_from_event( struct inotify_event *ie ) @@ -1133,6 +1128,11 @@ DECL_HANDLER(read_directory_changes) if (event) reset_event( event ); + /* if there's already a change in the queue, send it */ + if (!list_empty( &dir->change_q ) && + !list_empty( &dir->change_records )) + async_terminate_head( &dir->change_q, STATUS_ALERTED ); + /* setup the real notification */ if (!inotify_adjust_changes( dir )) dnotify_adjust_changes( dir );