Merge branch 'for-next' of git://git.infradead.org/users/eparis/notify

[~shefty/rdma-dev.git] / kernel / audit_watch.c

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 9a9ae6e3d290025179a964c577de517f24fbe75c..4a599f699adcfeca242e34f1a9691385a500450e 100644 (file)
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -350,7 +350,7 @@ static void audit_remove_parent_watches(struct audit_parent *parent)
        }
        mutex_unlock(&audit_filter_mutex);
 
        }
        mutex_unlock(&audit_filter_mutex);
 

-       fsnotify_destroy_mark(&parent->mark);
+       fsnotify_destroy_mark(&parent->mark, audit_watch_group);

 }
 
 /* Get path information necessary for adding watches. */
 }
 
 /* Get path information necessary for adding watches. */


@@ -457,7 +457,7 @@ void audit_remove_watch_rule(struct audit_krule *krule)
 
                if (list_empty(&parent->watches)) {
                        audit_get_parent(parent);
 
                if (list_empty(&parent->watches)) {
                        audit_get_parent(parent);

-                       fsnotify_destroy_mark(&parent->mark);
+                       fsnotify_destroy_mark(&parent->mark, audit_watch_group);

                        audit_put_parent(parent);
                }
        }
                        audit_put_parent(parent);
                }
        }