projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[IA64] Move local_softirq_pending() definition
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
kernel
/
audit_tree.c
diff --git
a/kernel/audit_tree.c
b/kernel/audit_tree.c
index
b20fb05
..
7f18d3a
100644
(file)
--- a/
kernel/audit_tree.c
+++ b/
kernel/audit_tree.c
@@
-259,7
+259,7
@@
static void untag_chunk(struct node *p)
if (!new)
goto Fallback;
fsnotify_duplicate_mark(&new->mark, entry);
if (!new)
goto Fallback;
fsnotify_duplicate_mark(&new->mark, entry);
- if (fsnotify_add_mark(&new->mark, new->mark.group, new->mark.i.inode, 1)) {
+ if (fsnotify_add_mark(&new->mark, new->mark.group, new->mark.i.inode,
NULL,
1)) {
free_chunk(new);
goto Fallback;
}
free_chunk(new);
goto Fallback;
}
@@
-322,7
+322,7
@@
static int create_chunk(struct inode *inode, struct audit_tree *tree)
return -ENOMEM;
entry = &chunk->mark;
return -ENOMEM;
entry = &chunk->mark;
- if (fsnotify_add_mark(entry, audit_tree_group, inode, 0)) {
+ if (fsnotify_add_mark(entry, audit_tree_group, inode,
NULL,
0)) {
free_chunk(chunk);
return -ENOSPC;
}
free_chunk(chunk);
return -ENOSPC;
}
@@
-360,9
+360,7
@@
static int tag_chunk(struct inode *inode, struct audit_tree *tree)
struct node *p;
int n;
struct node *p;
int n;
- spin_lock(&inode->i_lock);
- old_entry = fsnotify_find_mark(audit_tree_group, inode);
- spin_unlock(&inode->i_lock);
+ old_entry = fsnotify_find_inode_mark(audit_tree_group, inode);
if (!old_entry)
return create_chunk(inode, tree);
if (!old_entry)
return create_chunk(inode, tree);
@@
-397,7
+395,7
@@
static int tag_chunk(struct inode *inode, struct audit_tree *tree)
}
fsnotify_duplicate_mark(chunk_entry, old_entry);
}
fsnotify_duplicate_mark(chunk_entry, old_entry);
- if (fsnotify_add_mark(chunk_entry, chunk_entry->group, chunk_entry->i.inode, 1)) {
+ if (fsnotify_add_mark(chunk_entry, chunk_entry->group, chunk_entry->i.inode,
NULL,
1)) {
spin_unlock(&old_entry->lock);
free_chunk(chunk);
fsnotify_put_mark(old_entry);
spin_unlock(&old_entry->lock);
free_chunk(chunk);
fsnotify_put_mark(old_entry);
@@
-905,7
+903,10
@@
static void evict_chunk(struct audit_chunk *chunk)
mutex_unlock(&audit_filter_mutex);
}
mutex_unlock(&audit_filter_mutex);
}
-static int audit_tree_handle_event(struct fsnotify_group *group, struct fsnotify_event *event)
+static int audit_tree_handle_event(struct fsnotify_group *group,
+ struct fsnotify_mark *inode_mark,
+ struct fsnotify_mark *vfsmonut_mark,
+ struct fsnotify_event *event)
{
BUG();
return -EOPNOTSUPP;
{
BUG();
return -EOPNOTSUPP;
@@
-920,10
+921,11
@@
static void audit_tree_freeing_mark(struct fsnotify_mark *entry, struct fsnotify
}
static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode,
}
static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode,
- struct vfsmount *mnt, __u32 mask, void *data,
- int data_type)
+ struct fsnotify_mark *inode_mark,
+ struct fsnotify_mark *vfsmount_mark,
+ __u32 mask, void *data, int data_type)
{
{
- return
0
;
+ return
false
;
}
static const struct fsnotify_ops audit_tree_ops = {
}
static const struct fsnotify_ops audit_tree_ops = {