summaryrefslogtreecommitdiff
path: root/fs/notify
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2020-05-12 21:17:15 +0300
committerJan Kara <jack@suse.cz>2020-05-13 18:13:12 +0300
commitab3c4da0ad12fb8b4c80ab2d98ce214a58e00c04 (patch)
tree9b4465feca176660aac2f3138f699e04df77eac2 /fs/notify
parent374ad001f762e4e4c736c5e2455e9949555459ab (diff)
downloadlinux-ab3c4da0ad12fb8b4c80ab2d98ce214a58e00c04.tar.xz
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>
Diffstat (limited to 'fs/notify')
-rw-r--r--fs/notify/fanotify/fanotify.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 5435a40f82be..95480d3dcff7 100644
--- 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;
}