diff options
| author | Jan Kara <jack@suse.cz> | 2019-01-09 13:21:01 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2019-02-18 12:41:16 +0100 |
| commit | ca6f86998d810d4a9fe172bf4cb6d3353636881f (patch) | |
| tree | 15a4d97762ad8d2a390dc4b5e601c227ee6fc793 /fs/notify | |
| parent | fsnotify: Create function to remove event from notification list (diff) | |
| download | linux-ca6f86998d810d4a9fe172bf4cb6d3353636881f.tar.xz linux-ca6f86998d810d4a9fe172bf4cb6d3353636881f.zip | |
fanotify: Simplify cleaning of access_list
Simplify iteration cleaning access_list in fanotify_release(). That will
make following changes more obvious.
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_user.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 121c84fc55ee..a73ada49fd3e 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -404,7 +404,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 *event, *next; + struct fanotify_perm_event *event; struct fsnotify_event *fsn_event; /* @@ -419,11 +419,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, fae.fse.list); list_del_init(&event->fae.fse.list); event->response = FAN_ALLOW; } |