Skip to content

Commit ab3c4da

Browse files
Fabian Frederickjankara
authored andcommitted
fanotify: prefix should_merge()
Prefix function with fanotify_ like others. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Fabian Frederick <[email protected]> Reviewed-by: Amir Goldstein <[email protected]> Signed-off-by: Jan Kara <[email protected]>
1 parent 374ad00 commit ab3c4da

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/notify/fanotify/fanotify.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static bool fanotify_name_event_equal(struct fanotify_name_event *fne1,
7070
return !memcmp(fne1->name, fne2->name, fne1->name_len);
7171
}
7272

73-
static bool should_merge(struct fsnotify_event *old_fsn,
73+
static bool fanotify_should_merge(struct fsnotify_event *old_fsn,
7474
struct fsnotify_event *new_fsn)
7575
{
7676
struct fanotify_event *old, *new;
@@ -129,7 +129,7 @@ static int fanotify_merge(struct list_head *list, struct fsnotify_event *event)
129129
return 0;
130130

131131
list_for_each_entry_reverse(test_event, list, list) {
132-
if (should_merge(test_event, event)) {
132+
if (fanotify_should_merge(test_event, event)) {
133133
FANOTIFY_E(test_event)->mask |= new->mask;
134134
return 1;
135135
}

0 commit comments

Comments
 (0)