server: Map FILE_NOTIFY_CHANGE_LAST_ACCESS to IN_MODIFY.

Using IN_ACCESS leads to generating stray change notifications.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Dmitry Timoshkov 2018-11-06 17:05:56 +03:00 committed by Alexandre Julliard
parent 48e5273cd5
commit bfa98dbb1b
1 changed files with 2 additions and 4 deletions

View File

@ -742,11 +742,9 @@ static unsigned int filter_from_event( struct inotify_event *ie )
if (ie->mask & (IN_MOVED_FROM | IN_MOVED_TO | IN_DELETE | IN_CREATE)) if (ie->mask & (IN_MOVED_FROM | IN_MOVED_TO | IN_DELETE | IN_CREATE))
filter |= FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME; filter |= FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME;
if (ie->mask & IN_MODIFY) if (ie->mask & IN_MODIFY)
filter |= FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE; filter |= FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_LAST_ACCESS;
if (ie->mask & IN_ATTRIB) if (ie->mask & IN_ATTRIB)
filter |= FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SECURITY; filter |= FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SECURITY;
if (ie->mask & IN_ACCESS)
filter |= FILE_NOTIFY_CHANGE_LAST_ACCESS;
if (ie->mask & IN_CREATE) if (ie->mask & IN_CREATE)
filter |= FILE_NOTIFY_CHANGE_CREATION; filter |= FILE_NOTIFY_CHANGE_CREATION;
@ -979,7 +977,7 @@ static int map_flags( unsigned int filter )
if (filter & FILE_NOTIFY_CHANGE_LAST_WRITE) if (filter & FILE_NOTIFY_CHANGE_LAST_WRITE)
mask |= IN_MODIFY; mask |= IN_MODIFY;
if (filter & FILE_NOTIFY_CHANGE_LAST_ACCESS) if (filter & FILE_NOTIFY_CHANGE_LAST_ACCESS)
mask |= IN_ACCESS; mask |= IN_MODIFY;
if (filter & FILE_NOTIFY_CHANGE_SECURITY) if (filter & FILE_NOTIFY_CHANGE_SECURITY)
mask |= IN_ATTRIB; mask |= IN_ATTRIB;