Skip to content

Commit

Permalink
fsnotify: rename event handling functions
Browse files Browse the repository at this point in the history 
Rename fsnotify_add_notify_event() to fsnotify_add_event() since the
"notify" part is duplicit.  Rename fsnotify_remove_notify_event() and
fsnotify_peek_notify_event() to fsnotify_remove_first_event() and
fsnotify_peek_first_event() respectively since "notify" part is duplicit
and they really look at the first event in the queue.

[[email protected]: coding-style fixes]
Signed-off-by: Jan Kara <[email protected]>
Cc: Eric Paris <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
@jankara @torvalds
jankara authored and torvalds committed Aug 7, 2014
1 parent 3e58406 commit 8ba8fa9
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion fs/notify/fanotify/fanotify.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ static int fanotify_handle_event(struct fsnotify_group *group,
return -ENOMEM;

fsn_event = &event->fse;
ret = fsnotify_add_notify_event(group, fsn_event, fanotify_merge);
ret = fsnotify_add_event(group, fsn_event, fanotify_merge);
if (ret) {
/* Permission events shouldn't be merged */
BUG_ON(ret == 1 && mask & FAN_ALL_PERM_EVENTS);
Expand Down
2 changes: 1 addition & 1 deletion fs/notify/fanotify/fanotify_user.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group,

/* held the notification_mutex the whole time, so this is the
* same event we peeked above */
return fsnotify_remove_notify_event(group);
return fsnotify_remove_first_event(group);
}

static int create_fd(struct fsnotify_group *group,
Expand Down
2 changes: 1 addition & 1 deletion fs/notify/inotify/inotify_fsnotify.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ int inotify_handle_event(struct fsnotify_group *group,
if (len)
strcpy(event->name, file_name);

ret = fsnotify_add_notify_event(group, fsn_event, inotify_merge);
ret = fsnotify_add_event(group, fsn_event, inotify_merge);
if (ret) {
/* Our event wasn't used in the end. Free it. */
fsnotify_destroy_event(group, fsn_event);
Expand Down
4 changes: 2 additions & 2 deletions fs/notify/inotify/inotify_user.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group,
if (fsnotify_notify_queue_is_empty(group))
return NULL;

event = fsnotify_peek_notify_event(group);
event = fsnotify_peek_first_event(group);

pr_debug("%s: group=%p event=%p\n", __func__, group, event);

Expand All @@ -159,7 +159,7 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group,

/* held the notification_mutex the whole time, so this is the
* same event we peeked above */
fsnotify_remove_notify_event(group);
fsnotify_remove_first_event(group);

return event;
}
Expand Down
19 changes: 10 additions & 9 deletions fs/notify/notification.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ void fsnotify_destroy_event(struct fsnotify_group *group,
* added to the queue, 1 if the event was merged with some other queued event,
* 2 if the queue of events has overflown.
*/
int fsnotify_add_notify_event(struct fsnotify_group *group,
struct fsnotify_event *event,
int (*merge)(struct list_head *,
struct fsnotify_event *))
int fsnotify_add_event(struct fsnotify_group *group,
struct fsnotify_event *event,
int (*merge)(struct list_head *,
struct fsnotify_event *))
{
int ret = 0;
struct list_head *list = &group->notification_list;
Expand Down Expand Up @@ -128,7 +128,7 @@ int fsnotify_add_notify_event(struct fsnotify_group *group,
* Remove and return the first event from the notification list. It is the
* responsibility of the caller to destroy the obtained event
*/
struct fsnotify_event *fsnotify_remove_notify_event(struct fsnotify_group *group)
struct fsnotify_event *fsnotify_remove_first_event(struct fsnotify_group *group)
{
struct fsnotify_event *event;

Expand All @@ -140,7 +140,7 @@ struct fsnotify_event *fsnotify_remove_notify_event(struct fsnotify_group *group
struct fsnotify_event, list);
/*
* We need to init list head for the case of overflow event so that
* check in fsnotify_add_notify_events() works
* check in fsnotify_add_event() works
*/
list_del_init(&event->list);
group->q_len--;
Expand All @@ -149,9 +149,10 @@ struct fsnotify_event *fsnotify_remove_notify_event(struct fsnotify_group *group
}

/*
* This will not remove the event, that must be done with fsnotify_remove_notify_event()
* This will not remove the event, that must be done with
* fsnotify_remove_first_event()
*/
struct fsnotify_event *fsnotify_peek_notify_event(struct fsnotify_group *group)
struct fsnotify_event *fsnotify_peek_first_event(struct fsnotify_group *group)
{
BUG_ON(!mutex_is_locked(&group->notification_mutex));

Expand All @@ -169,7 +170,7 @@ void fsnotify_flush_notify(struct fsnotify_group *group)

mutex_lock(&group->notification_mutex);
while (!fsnotify_notify_queue_is_empty(group)) {
event = fsnotify_remove_notify_event(group);
event = fsnotify_remove_first_event(group);
fsnotify_destroy_event(group, event);
}
mutex_unlock(&group->notification_mutex);
Expand Down
12 changes: 6 additions & 6 deletions include/linux/fsnotify_backend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,16 +322,16 @@ extern int fsnotify_fasync(int fd, struct file *file, int on);
extern void fsnotify_destroy_event(struct fsnotify_group *group,
struct fsnotify_event *event);
/* attach the event to the group notification queue */
extern int fsnotify_add_notify_event(struct fsnotify_group *group,
struct fsnotify_event *event,
int (*merge)(struct list_head *,
struct fsnotify_event *));
extern int fsnotify_add_event(struct fsnotify_group *group,
struct fsnotify_event *event,
int (*merge)(struct list_head *,
struct fsnotify_event *));
/* true if the group notification queue is empty */
extern bool fsnotify_notify_queue_is_empty(struct fsnotify_group *group);
/* return, but do not dequeue the first event on the notification queue */
extern struct fsnotify_event *fsnotify_peek_notify_event(struct fsnotify_group *group);
extern struct fsnotify_event *fsnotify_peek_first_event(struct fsnotify_group *group);
/* return AND dequeue the first event on the notification queue */
extern struct fsnotify_event *fsnotify_remove_notify_event(struct fsnotify_group *group);
extern struct fsnotify_event *fsnotify_remove_first_event(struct fsnotify_group *group);

/* functions used to manipulate the marks attached to inodes */

Expand Down

0 comments on commit 8ba8fa9

Please sign in to comment.