fsnotify: per group notification queue merge types
inotify only wishes to merge a new event with the last event on the notification fifo. fanotify is willing to merge any events including by means of bitwise OR masks of multiple events together. This patch moves the inotify event merging logic out of the generic fsnotify notification.c and into the inotify code. This allows each use of fsnotify to provide their own merge functionality. Signed-off-by: Eric Paris <eparis@redhat.com>
This commit is contained in:
@@ -531,7 +531,7 @@ void inotify_ignored_and_remove_idr(struct fsnotify_mark_entry *entry,
|
||||
fsn_event_priv->group = group;
|
||||
event_priv->wd = ientry->wd;
|
||||
|
||||
ret = fsnotify_add_notify_event(group, ignored_event, fsn_event_priv);
|
||||
ret = fsnotify_add_notify_event(group, ignored_event, fsn_event_priv, NULL);
|
||||
if (ret)
|
||||
inotify_free_event_priv(fsn_event_priv);
|
||||
|
||||
|
Reference in New Issue
Block a user