aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/audit_watch.c
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2009-12-17 21:24:27 -0500
committerEric Paris <eparis@redhat.com>2010-07-28 09:58:57 -0400
commit5444e2981c31d0ed7465475e451b8437084337e5 (patch)
tree66b6d84b7aab886b44a3467a139d258d9aba09df /kernel/audit_watch.c
parent32c3263221bd63316815286dccacdc7abfd7f3c4 (diff)
fsnotify: split generic and inode specific mark code
currently all marking is done by functions in inode-mark.c. Some of this is pretty generic and should be instead done in a generic function and we should only put the inode specific code in inode-mark.c Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel/audit_watch.c')
-rw-r--r--kernel/audit_watch.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index d85fa538a72..7499397a610 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -101,7 +101,7 @@ static inline struct audit_parent *audit_find_parent(struct inode *inode)
101 struct audit_parent *parent = NULL; 101 struct audit_parent *parent = NULL;
102 struct fsnotify_mark *entry; 102 struct fsnotify_mark *entry;
103 103
104 entry = fsnotify_find_mark(audit_watch_group, inode); 104 entry = fsnotify_find_inode_mark(audit_watch_group, inode);
105 if (entry) 105 if (entry)
106 parent = container_of(entry, struct audit_parent, mark); 106 parent = container_of(entry, struct audit_parent, mark);
107 107
@@ -158,7 +158,7 @@ static struct audit_parent *audit_init_parent(struct nameidata *ndp)
158 158
159 fsnotify_init_mark(&parent->mark, audit_watch_free_mark); 159 fsnotify_init_mark(&parent->mark, audit_watch_free_mark);
160 parent->mark.mask = AUDIT_FS_WATCH; 160 parent->mark.mask = AUDIT_FS_WATCH;
161 ret = fsnotify_add_mark(&parent->mark, audit_watch_group, inode, 0); 161 ret = fsnotify_add_mark(&parent->mark, audit_watch_group, inode, NULL, 0);
162 if (ret < 0) { 162 if (ret < 0) {
163 audit_free_parent(parent); 163 audit_free_parent(parent);
164 return ERR_PTR(ret); 164 return ERR_PTR(ret);
@@ -517,7 +517,7 @@ static bool audit_watch_should_send_event(struct fsnotify_group *group, struct i
517 struct fsnotify_mark *entry; 517 struct fsnotify_mark *entry;
518 bool send; 518 bool send;
519 519
520 entry = fsnotify_find_mark(group, inode); 520 entry = fsnotify_find_inode_mark(group, inode);
521 if (!entry) 521 if (!entry)
522 return false; 522 return false;
523 523