From 86a0f6938d6b8020faa520e29e3c2909e5e7820e Mon Sep 17 00:00:00 2001 From: Lino Sanfilippo Date: Tue, 14 Jun 2011 17:29:53 +0200 Subject: [PATCH] --- yaml --- r: 347902 b: refs/heads/master c: 64c20d2a20fce295c260ea6cb3b468edfa2fb07b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/notify/mark.c | 10 ++-------- trunk/include/linux/fsnotify_backend.h | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index af7fca064a0c..a103379d971b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5a335b845792d2a69ed1e244c0b233117b7db3c +refs/heads/master: 64c20d2a20fce295c260ea6cb3b468edfa2fb07b diff --git a/trunk/fs/notify/mark.c b/trunk/fs/notify/mark.c index f9dda0304a10..0e93d90bb753 100644 --- a/trunk/fs/notify/mark.c +++ b/trunk/fs/notify/mark.c @@ -299,22 +299,16 @@ void fsnotify_clear_marks_by_group_flags(struct fsnotify_group *group, unsigned int flags) { struct fsnotify_mark *lmark, *mark; - LIST_HEAD(free_list); mutex_lock(&group->mark_mutex); list_for_each_entry_safe(mark, lmark, &group->marks_list, g_list) { if (mark->flags & flags) { - list_add(&mark->free_g_list, &free_list); - list_del_init(&mark->g_list); fsnotify_get_mark(mark); + fsnotify_destroy_mark_locked(mark, group); + fsnotify_put_mark(mark); } } mutex_unlock(&group->mark_mutex); - - list_for_each_entry_safe(mark, lmark, &free_list, free_g_list) { - fsnotify_destroy_mark(mark, group); - fsnotify_put_mark(mark); - } } /* diff --git a/trunk/include/linux/fsnotify_backend.h b/trunk/include/linux/fsnotify_backend.h index 26c06afa264e..5a8899350456 100644 --- a/trunk/include/linux/fsnotify_backend.h +++ b/trunk/include/linux/fsnotify_backend.h @@ -287,7 +287,6 @@ struct fsnotify_mark { struct fsnotify_inode_mark i; struct fsnotify_vfsmount_mark m; }; - struct list_head free_g_list; /* tmp list used when freeing this mark */ __u32 ignored_mask; /* events types to ignore */ #define FSNOTIFY_MARK_FLAG_INODE 0x01 #define FSNOTIFY_MARK_FLAG_VFSMOUNT 0x02