diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-16 16:35:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-16 16:35:45 -0800 |
| commit | cae3cf8f1b6bd60ec4a6c657f4399e2f8269cab0 (patch) | |
| tree | bc427f9dd330c0e7fef30a5499025d8f710df26a /include/linux/fs.h | |
| parent | 94dad77b4d2ae306a8055447ebabaaac0762fc5f (diff) | |
| parent | 76ae6d567b0f17402feb35164a9323ca8a88f97d (diff) | |
Merge
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 59891f8a049b..723f41b51ced 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -212,7 +212,6 @@ extern int dir_notify_enable; #include <linux/list.h> #include <linux/radix-tree.h> #include <linux/prio_tree.h> -#include <linux/audit.h> #include <linux/init.h> #include <asm/atomic.h> @@ -1272,13 +1271,7 @@ extern void __init vfs_caches_init(unsigned long); #ifndef CONFIG_AUDITSYSCALL #define putname(name) __putname(name) #else -#define putname(name) \ - do { \ - if (unlikely(current->audit_context)) \ - audit_putname(name); \ - else \ - __putname(name); \ - } while (0) +extern void putname(const char *name); #endif extern int register_blkdev(unsigned int, const char *); |