diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-30 08:35:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-30 08:35:35 -0700 |
| commit | 847f877600313e65c5659476b30d74a6f66e388e (patch) | |
| tree | b4390fb56dc3c9a47cb51f3a086515a376cffc0c /kernel/audit_watch.c | |
| parent | 79346507ad48895f41b438fa562b1965721f36b9 (diff) | |
| parent | 120a795da07c9a02221ca23464c28a7c6ad7de1d (diff) | |
| download | op-kernel-dev-847f877600313e65c5659476b30d74a6f66e388e.zip op-kernel-dev-847f877600313e65c5659476b30d74a6f66e388e.tar.gz | |
Merge branch 'audit.b64' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b64' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
audit mmap
audit: make link()/linkat() match "attribute change" predicate
audit: Use rcu for task lookup protection
audit: Do not send uninitialized data for AUDIT_TTY_GET
audit: Call tty_audit_push_task() outside preempt disabled
in untag_chunk() we need to do alloc_chunk() a bit earlier
audit: make functions static
Audit: add support to match lsm labels on user audit messages
Diffstat (limited to 'kernel/audit_watch.c')
| -rw-r--r-- | kernel/audit_watch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index f0c9b2e..d2e3c78 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c @@ -60,7 +60,7 @@ struct audit_parent { }; /* fsnotify handle. */ -struct fsnotify_group *audit_watch_group; +static struct fsnotify_group *audit_watch_group; /* fsnotify events we care about. */ #define AUDIT_FS_WATCH (FS_MOVE | FS_CREATE | FS_DELETE | FS_DELETE_SELF |\ @@ -123,7 +123,7 @@ void audit_put_watch(struct audit_watch *watch) } } -void audit_remove_watch(struct audit_watch *watch) +static void audit_remove_watch(struct audit_watch *watch) { list_del(&watch->wlist); audit_put_parent(watch->parent); |
