On Thu 09-02-17 20:45:22, Kinglong Mee wrote:
> v2, change the subject to "simplify the code"
Thanks. I've merged the patch to my tree and will push it to Linus in the
merge window.
Honza
>
> Signed-off-by: Kinglong Mee <kinglongmee@xxxxxxxxx>
> ---
> fs/notify/fanotify/fanotify.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
> index bbc175d..a4c4622 100644
> --- a/fs/notify/fanotify/fanotify.c
> +++ b/fs/notify/fanotify/fanotify.c
> @@ -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
> --
> 2.9.3
>
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
