AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

fanotify: prefix should_merge()

Browse Source 
Prefix function with fanotify_ like others.

Link: https://lore.kernel.org/r/20200512181715.405728-1-fabf@skynet.be
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Fabian Frederick 2020-05-12 20:17:15 +02:00 committed by Jan Kara
parent 374ad001f7
commit ab3c4da0ad
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/notify/fanotify/fanotify.c
View File

@ -70,7 +70,7 @@ static bool fanotify_name_event_equal(struct fanotify_name_event *fne1,
return !memcmp(fne1->name, fne2->name, fne1->name_len); return !memcmp(fne1->name, fne2->name, fne1->name_len);
} }
static bool should_merge(struct fsnotify_event *old_fsn, static bool fanotify_should_merge(struct fsnotify_event *old_fsn,
struct fsnotify_event *new_fsn) struct fsnotify_event *new_fsn)
{ {
struct fanotify_event *old, *new; struct fanotify_event *old, *new;
@ -129,7 +129,7 @@ static int fanotify_merge(struct list_head *list, struct fsnotify_event *event)
return 0; return 0;
list_for_each_entry_reverse(test_event, list, list) { list_for_each_entry_reverse(test_event, list, list) {
if (should_merge(test_event, event)) { if (fanotify_should_merge(test_event, event)) {
FANOTIFY_E(test_event)->mask |= new->mask; FANOTIFY_E(test_event)->mask |= new->mask;
return 1; return 1;
} }