diff options
author | Eric Paris <eparis@redhat.com> | 2010-07-28 10:18:37 -0400 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2010-07-28 10:18:50 -0400 |
commit | f70ab54cc6c3907b0727ba332b3976f80f3846d0 (patch) | |
tree | 2a22097325a668a0d08d4ea3354d0e6c95fddd86 /include | |
parent | 5ba08e2eeb06355f66ed62ae97bb87d145973a9a (diff) |
fsnotify: fsnotify_add_notify_event should return an event
Rather than the horrific void ** argument and such just to pass the
fanotify_merge event back to the caller of fsnotify_add_notify_event() have
those things return an event if it was different than the event suggusted to
be added.
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fsnotify_backend.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h index a83859d7d36e..564b5ea4a831 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h | |||
@@ -379,13 +379,11 @@ extern struct fsnotify_event_private_data *fsnotify_remove_priv_from_event(struc | |||
379 | struct fsnotify_event *event); | 379 | struct fsnotify_event *event); |
380 | 380 | ||
381 | /* attach the event to the group notification queue */ | 381 | /* attach the event to the group notification queue */ |
382 | extern int fsnotify_add_notify_event(struct fsnotify_group *group, | 382 | extern struct fsnotify_event *fsnotify_add_notify_event(struct fsnotify_group *group, |
383 | struct fsnotify_event *event, | 383 | struct fsnotify_event *event, |
384 | struct fsnotify_event_private_data *priv, | 384 | struct fsnotify_event_private_data *priv, |
385 | int (*merge)(struct list_head *, | 385 | struct fsnotify_event *(*merge)(struct list_head *, |
386 | struct fsnotify_event *, | 386 | struct fsnotify_event *)); |
387 | void **), | ||
388 | void **arg); | ||
389 | /* true if the group notification queue is empty */ | 387 | /* true if the group notification queue is empty */ |
390 | extern bool fsnotify_notify_queue_is_empty(struct fsnotify_group *group); | 388 | extern bool fsnotify_notify_queue_is_empty(struct fsnotify_group *group); |
391 | /* return, but do not dequeue the first event on the notification queue */ | 389 | /* return, but do not dequeue the first event on the notification queue */ |