server: Fix a race condition in the delivery of change notifications.

This commit is contained in:
Mike McCormack 2006-03-28 17:58:07 +09:00 committed by Alexandre Julliard
parent c44410d1e3
commit f5c1381e06
1 changed files with 5 additions and 5 deletions

View File

@ -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 );