aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/audit_tree.c
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2009-12-17 21:24:24 -0500
committerEric Paris <eparis@redhat.com>2010-07-28 09:58:53 -0400
commite61ce86737b4d60521e4e71f9892fe4bdcfb688b (patch)
treea1aba411504ac028d4ead6f28ca05bd024c74142 /kernel/audit_tree.c
parent72acc854427948efed7a83da27f7dc3239ac9afc (diff)
fsnotify: rename fsnotify_mark_entry to just fsnotify_mark
The name is long and it serves no real purpose. So rename fsnotify_mark_entry to just fsnotify_mark. Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel/audit_tree.c')
-rw-r--r--kernel/audit_tree.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index c21b05d25224..f16f909fbbc1 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -22,7 +22,7 @@ struct audit_tree {
22 22
23struct audit_chunk { 23struct audit_chunk {
24 struct list_head hash; 24 struct list_head hash;
25 struct fsnotify_mark_entry mark; 25 struct fsnotify_mark mark;
26 struct list_head trees; /* with root here */ 26 struct list_head trees; /* with root here */
27 int dead; 27 int dead;
28 int count; 28 int count;
@@ -134,7 +134,7 @@ static void __put_chunk(struct rcu_head *rcu)
134 audit_put_chunk(chunk); 134 audit_put_chunk(chunk);
135} 135}
136 136
137static void audit_tree_destroy_watch(struct fsnotify_mark_entry *entry) 137static void audit_tree_destroy_watch(struct fsnotify_mark *entry)
138{ 138{
139 struct audit_chunk *chunk = container_of(entry, struct audit_chunk, mark); 139 struct audit_chunk *chunk = container_of(entry, struct audit_chunk, mark);
140 call_rcu(&chunk->head, __put_chunk); 140 call_rcu(&chunk->head, __put_chunk);
@@ -176,7 +176,7 @@ static inline struct list_head *chunk_hash(const struct inode *inode)
176/* hash_lock & entry->lock is held by caller */ 176/* hash_lock & entry->lock is held by caller */
177static void insert_hash(struct audit_chunk *chunk) 177static void insert_hash(struct audit_chunk *chunk)
178{ 178{
179 struct fsnotify_mark_entry *entry = &chunk->mark; 179 struct fsnotify_mark *entry = &chunk->mark;
180 struct list_head *list; 180 struct list_head *list;
181 181
182 if (!entry->i.inode) 182 if (!entry->i.inode)
@@ -222,7 +222,7 @@ static struct audit_chunk *find_chunk(struct node *p)
222static void untag_chunk(struct node *p) 222static void untag_chunk(struct node *p)
223{ 223{
224 struct audit_chunk *chunk = find_chunk(p); 224 struct audit_chunk *chunk = find_chunk(p);
225 struct fsnotify_mark_entry *entry = &chunk->mark; 225 struct fsnotify_mark *entry = &chunk->mark;
226 struct audit_chunk *new; 226 struct audit_chunk *new;
227 struct audit_tree *owner; 227 struct audit_tree *owner;
228 int size = chunk->count - 1; 228 int size = chunk->count - 1;
@@ -316,7 +316,7 @@ out:
316 316
317static int create_chunk(struct inode *inode, struct audit_tree *tree) 317static int create_chunk(struct inode *inode, struct audit_tree *tree)
318{ 318{
319 struct fsnotify_mark_entry *entry; 319 struct fsnotify_mark *entry;
320 struct audit_chunk *chunk = alloc_chunk(1); 320 struct audit_chunk *chunk = alloc_chunk(1);
321 if (!chunk) 321 if (!chunk)
322 return -ENOMEM; 322 return -ENOMEM;
@@ -354,7 +354,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree)
354/* the first tagged inode becomes root of tree */ 354/* the first tagged inode becomes root of tree */
355static int tag_chunk(struct inode *inode, struct audit_tree *tree) 355static int tag_chunk(struct inode *inode, struct audit_tree *tree)
356{ 356{
357 struct fsnotify_mark_entry *old_entry, *chunk_entry; 357 struct fsnotify_mark *old_entry, *chunk_entry;
358 struct audit_tree *owner; 358 struct audit_tree *owner;
359 struct audit_chunk *chunk, *old; 359 struct audit_chunk *chunk, *old;
360 struct node *p; 360 struct node *p;
@@ -911,7 +911,7 @@ static int audit_tree_handle_event(struct fsnotify_group *group, struct fsnotify
911 return -EOPNOTSUPP; 911 return -EOPNOTSUPP;
912} 912}
913 913
914static void audit_tree_freeing_mark(struct fsnotify_mark_entry *entry, struct fsnotify_group *group) 914static void audit_tree_freeing_mark(struct fsnotify_mark *entry, struct fsnotify_group *group)
915{ 915{
916 struct audit_chunk *chunk = container_of(entry, struct audit_chunk, mark); 916 struct audit_chunk *chunk = container_of(entry, struct audit_chunk, mark);
917 917