diff options
Diffstat (limited to 'kernel/audit_tree.c')
-rw-r--r-- | kernel/audit_tree.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 67e6956c0b61..c99ebaae5abc 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
@@ -288,8 +288,8 @@ static void untag_chunk(struct node *p) | |||
288 | if (!new) | 288 | if (!new) |
289 | goto Fallback; | 289 | goto Fallback; |
290 | 290 | ||
291 | if (fsnotify_add_mark_locked(&new->mark, entry->connector->inode, | 291 | if (fsnotify_add_inode_mark_locked(&new->mark, entry->connector->inode, |
292 | NULL, 1)) { | 292 | 1)) { |
293 | fsnotify_put_mark(&new->mark); | 293 | fsnotify_put_mark(&new->mark); |
294 | goto Fallback; | 294 | goto Fallback; |
295 | } | 295 | } |
@@ -354,7 +354,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree) | |||
354 | return -ENOMEM; | 354 | return -ENOMEM; |
355 | 355 | ||
356 | entry = &chunk->mark; | 356 | entry = &chunk->mark; |
357 | if (fsnotify_add_mark(entry, inode, NULL, 0)) { | 357 | if (fsnotify_add_inode_mark(entry, inode, 0)) { |
358 | fsnotify_put_mark(entry); | 358 | fsnotify_put_mark(entry); |
359 | return -ENOSPC; | 359 | return -ENOSPC; |
360 | } | 360 | } |
@@ -434,8 +434,8 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree) | |||
434 | return -ENOENT; | 434 | return -ENOENT; |
435 | } | 435 | } |
436 | 436 | ||
437 | if (fsnotify_add_mark_locked(chunk_entry, | 437 | if (fsnotify_add_inode_mark_locked(chunk_entry, |
438 | old_entry->connector->inode, NULL, 1)) { | 438 | old_entry->connector->inode, 1)) { |
439 | spin_unlock(&old_entry->lock); | 439 | spin_unlock(&old_entry->lock); |
440 | mutex_unlock(&old_entry->group->mark_mutex); | 440 | mutex_unlock(&old_entry->group->mark_mutex); |
441 | fsnotify_put_mark(chunk_entry); | 441 | fsnotify_put_mark(chunk_entry); |
@@ -989,8 +989,6 @@ static void evict_chunk(struct audit_chunk *chunk) | |||
989 | 989 | ||
990 | static int audit_tree_handle_event(struct fsnotify_group *group, | 990 | static int audit_tree_handle_event(struct fsnotify_group *group, |
991 | struct inode *to_tell, | 991 | struct inode *to_tell, |
992 | struct fsnotify_mark *inode_mark, | ||
993 | struct fsnotify_mark *vfsmount_mark, | ||
994 | u32 mask, const void *data, int data_type, | 992 | u32 mask, const void *data, int data_type, |
995 | const unsigned char *file_name, u32 cookie, | 993 | const unsigned char *file_name, u32 cookie, |
996 | struct fsnotify_iter_info *iter_info) | 994 | struct fsnotify_iter_info *iter_info) |