Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68F85C282C2 for ; Wed, 13 Feb 2019 14:54:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B2D5222C1 for ; Wed, 13 Feb 2019 14:54:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403931AbfBMOy6 (ORCPT ); Wed, 13 Feb 2019 09:54:58 -0500 Received: from mx2.suse.de ([195.135.220.15]:60236 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726056AbfBMOy5 (ORCPT ); Wed, 13 Feb 2019 09:54:57 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id D1D39AC6C; Wed, 13 Feb 2019 14:54:55 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 598161E41F2; Wed, 13 Feb 2019 15:54:54 +0100 (CET) From: Jan Kara To: Cc: Amir Goldstein , Konstantin Khlebnikov , Vivek Trivedi , Orion Poplawski , Jan Kara Subject: [PATCH 4/6] fanotify: Simplify cleaning of access_list Date: Wed, 13 Feb 2019 15:54:41 +0100 Message-Id: <20190213145443.26836-5-jack@suse.cz> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190213145443.26836-1-jack@suse.cz> References: <20190213145443.26836-1-jack@suse.cz> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Simplify iteration cleaning access_list in fanotify_release(). That will make following changes more obvious. Signed-off-by: Jan Kara --- fs/notify/fanotify/fanotify_user.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 4e36f5642797..96dc469a4086 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -352,7 +352,7 @@ static ssize_t fanotify_write(struct file *file, const char __user *buf, size_t static int fanotify_release(struct inode *ignored, struct file *file) { struct fsnotify_group *group = file->private_data; - struct fanotify_perm_event_info *event, *next; + struct fanotify_perm_event_info *event; struct fsnotify_event *fsn_event; /* @@ -367,11 +367,9 @@ static int fanotify_release(struct inode *ignored, struct file *file) * and simulate reply from userspace. */ spin_lock(&group->notification_lock); - list_for_each_entry_safe(event, next, &group->fanotify_data.access_list, - fae.fse.list) { - pr_debug("%s: found group=%p event=%p\n", __func__, group, - event); - + while (!list_empty(&group->fanotify_data.access_list)) { + event = list_first_entry(&group->fanotify_data.access_list, + struct fanotify_perm_event_info, fae.fse.list); list_del_init(&event->fae.fse.list); event->response = FAN_ALLOW; } -- 2.16.4