diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/audit_tree.c | 10 | ||||
| -rw-r--r-- | kernel/audit_watch.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index ed206fd88cca..e81175ef25f8 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
| @@ -249,7 +249,7 @@ static void untag_chunk(struct node *p) | |||
| 249 | list_del_rcu(&chunk->hash); | 249 | list_del_rcu(&chunk->hash); |
| 250 | spin_unlock(&hash_lock); | 250 | spin_unlock(&hash_lock); |
| 251 | spin_unlock(&entry->lock); | 251 | spin_unlock(&entry->lock); |
| 252 | fsnotify_destroy_mark(entry); | 252 | fsnotify_destroy_mark(entry, audit_tree_group); |
| 253 | goto out; | 253 | goto out; |
| 254 | } | 254 | } |
| 255 | 255 | ||
| @@ -291,7 +291,7 @@ static void untag_chunk(struct node *p) | |||
| 291 | owner->root = new; | 291 | owner->root = new; |
| 292 | spin_unlock(&hash_lock); | 292 | spin_unlock(&hash_lock); |
| 293 | spin_unlock(&entry->lock); | 293 | spin_unlock(&entry->lock); |
| 294 | fsnotify_destroy_mark(entry); | 294 | fsnotify_destroy_mark(entry, audit_tree_group); |
| 295 | fsnotify_put_mark(&new->mark); /* drop initial reference */ | 295 | fsnotify_put_mark(&new->mark); /* drop initial reference */ |
| 296 | goto out; | 296 | goto out; |
| 297 | 297 | ||
| @@ -331,7 +331,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree) | |||
| 331 | spin_unlock(&hash_lock); | 331 | spin_unlock(&hash_lock); |
| 332 | chunk->dead = 1; | 332 | chunk->dead = 1; |
| 333 | spin_unlock(&entry->lock); | 333 | spin_unlock(&entry->lock); |
| 334 | fsnotify_destroy_mark(entry); | 334 | fsnotify_destroy_mark(entry, audit_tree_group); |
| 335 | fsnotify_put_mark(entry); | 335 | fsnotify_put_mark(entry); |
| 336 | return 0; | 336 | return 0; |
| 337 | } | 337 | } |
| @@ -412,7 +412,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree) | |||
| 412 | spin_unlock(&chunk_entry->lock); | 412 | spin_unlock(&chunk_entry->lock); |
| 413 | spin_unlock(&old_entry->lock); | 413 | spin_unlock(&old_entry->lock); |
| 414 | 414 | ||
| 415 | fsnotify_destroy_mark(chunk_entry); | 415 | fsnotify_destroy_mark(chunk_entry, audit_tree_group); |
| 416 | 416 | ||
| 417 | fsnotify_put_mark(chunk_entry); | 417 | fsnotify_put_mark(chunk_entry); |
| 418 | fsnotify_put_mark(old_entry); | 418 | fsnotify_put_mark(old_entry); |
| @@ -443,7 +443,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree) | |||
| 443 | spin_unlock(&hash_lock); | 443 | spin_unlock(&hash_lock); |
| 444 | spin_unlock(&chunk_entry->lock); | 444 | spin_unlock(&chunk_entry->lock); |
| 445 | spin_unlock(&old_entry->lock); | 445 | spin_unlock(&old_entry->lock); |
| 446 | fsnotify_destroy_mark(old_entry); | 446 | fsnotify_destroy_mark(old_entry, audit_tree_group); |
| 447 | fsnotify_put_mark(chunk_entry); /* drop initial reference */ | 447 | fsnotify_put_mark(chunk_entry); /* drop initial reference */ |
| 448 | fsnotify_put_mark(old_entry); /* pair to fsnotify_find mark_entry */ | 448 | fsnotify_put_mark(old_entry); /* pair to fsnotify_find mark_entry */ |
| 449 | return 0; | 449 | return 0; |
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index 3823281401b5..a66affc1c12c 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c | |||
| @@ -349,7 +349,7 @@ static void audit_remove_parent_watches(struct audit_parent *parent) | |||
| 349 | } | 349 | } |
| 350 | mutex_unlock(&audit_filter_mutex); | 350 | mutex_unlock(&audit_filter_mutex); |
| 351 | 351 | ||
| 352 | fsnotify_destroy_mark(&parent->mark); | 352 | fsnotify_destroy_mark(&parent->mark, audit_watch_group); |
| 353 | } | 353 | } |
| 354 | 354 | ||
| 355 | /* Get path information necessary for adding watches. */ | 355 | /* Get path information necessary for adding watches. */ |
| @@ -456,7 +456,7 @@ void audit_remove_watch_rule(struct audit_krule *krule) | |||
| 456 | 456 | ||
| 457 | if (list_empty(&parent->watches)) { | 457 | if (list_empty(&parent->watches)) { |
| 458 | audit_get_parent(parent); | 458 | audit_get_parent(parent); |
| 459 | fsnotify_destroy_mark(&parent->mark); | 459 | fsnotify_destroy_mark(&parent->mark, audit_watch_group); |
| 460 | audit_put_parent(parent); | 460 | audit_put_parent(parent); |
| 461 | } | 461 | } |
| 462 | } | 462 | } |
