fanotify: prefix should_merge()

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>

diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 5435a40f82bec95b140451057ca8415f36f5381e..95480d3dcff73bb8dac0f2a7e41e7ed97d6efbe5 100644 (file)
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -70,7 +70,7 @@ static bool fanotify_name_event_equal(struct fanotify_name_event *fne1,
        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 fanotify_event *old, *new;
@@ -129,7 +129,7 @@ static int fanotify_merge(struct list_head *list, struct fsnotify_event *event)
                return 0;
 
        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;
                        return 1;
                }