Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 15:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fanotify: simplify the code of fanotify_merge

Browse Source 
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Kinglong Mee 2017-02-09 20:45:22 +08:00 committed by Jan Kara
parent a074faad51
commit 6c71100db5
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,6 @@ static bool should_merge(struct fsnotify_event *old_fsn,
static int fanotify_merge(struct list_head *list, struct fsnotify_event *event)
{
struct fsnotify_event *test_event;
bool do_merge = false;
pr_debug("%s: list=%p event=%p\n", __func__, list, event);
@ -47,16 +46,12 @@ static int fanotify_merge(struct list_head *list, struct fsnotify_event *event)
list_for_each_entry_reverse(test_event, list, list) {
if (should_merge(test_event, event)) {
do_merge = true;
break;
test_event->mask |= event->mask;
return 1;
}
}
if (!do_merge)
return 0;
test_event->mask |= event->mask;
return 1;
return 0;
}
#ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS