fsnotify: remove destroy_list from fsnotify_mark

[mirror_ubuntu-zesty-kernel.git] / fs / notify / mark.c

diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 3942d5c9eb8da388a0e8cda278c49e0e08532e89..92e48c70f0f05542a75804fe7aac752672abd214 100644 (file)
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -161,7 +161,7 @@ void fsnotify_destroy_mark_locked(struct fsnotify_mark *mark,
        mutex_unlock(&group->mark_mutex);
 
        spin_lock(&destroy_lock);
-       list_add(&mark->destroy_list, &destroy_list);
+       list_add(&mark->g_list, &destroy_list);
        spin_unlock(&destroy_lock);
        wake_up(&destroy_waitq);
        /*
@@ -370,7 +370,7 @@ err:
        spin_unlock(&mark->lock);
 
        spin_lock(&destroy_lock);
-       list_add(&mark->destroy_list, &destroy_list);
+       list_add(&mark->g_list, &destroy_list);
        spin_unlock(&destroy_lock);
        wake_up(&destroy_waitq);
 
@@ -469,8 +469,8 @@ static int fsnotify_mark_destroy(void *ignored)
 
                synchronize_srcu(&fsnotify_mark_srcu);
 
-               list_for_each_entry_safe(mark, next, &private_destroy_list, destroy_list) {
-                       list_del_init(&mark->destroy_list);
+               list_for_each_entry_safe(mark, next, &private_destroy_list, g_list) {
+                       list_del_init(&mark->g_list);
                        fsnotify_put_mark(mark);
                }