Merge tag 'for_linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jwesse...

[cascardo/linux.git] / security / apparmor / include / apparmorfs.h

diff --git a/security/apparmor/include/apparmorfs.h b/security/apparmor/include/apparmorfs.h
index cb1e93a..7ea4769 100644 (file)
--- a/security/apparmor/include/apparmorfs.h
+++ b/security/apparmor/include/apparmorfs.h
@@ -15,6 +15,50 @@
 #ifndef __AA_APPARMORFS_H
 #define __AA_APPARMORFS_H
 
+enum aa_fs_type {
+       AA_FS_TYPE_BOOLEAN,
+       AA_FS_TYPE_STRING,
+       AA_FS_TYPE_U64,
+       AA_FS_TYPE_FOPS,
+       AA_FS_TYPE_DIR,
+};
+
+struct aa_fs_entry;
+
+struct aa_fs_entry {
+       const char *name;
+       struct dentry *dentry;
+       umode_t mode;
+       enum aa_fs_type v_type;
+       union {
+               bool boolean;
+               char *string;
+               unsigned long u64;
+               struct aa_fs_entry *files;
+       } v;
+       const struct file_operations *file_ops;
+};
+
+extern const struct file_operations aa_fs_seq_file_ops;
+
+#define AA_FS_FILE_BOOLEAN(_name, _value) \
+       { .name = (_name), .mode = 0444, \
+         .v_type = AA_FS_TYPE_BOOLEAN, .v.boolean = (_value), \
+         .file_ops = &aa_fs_seq_file_ops }
+#define AA_FS_FILE_STRING(_name, _value) \
+       { .name = (_name), .mode = 0444, \
+         .v_type = AA_FS_TYPE_STRING, .v.string = (_value), \
+         .file_ops = &aa_fs_seq_file_ops }
+#define AA_FS_FILE_U64(_name, _value) \
+       { .name = (_name), .mode = 0444, \
+         .v_type = AA_FS_TYPE_U64, .v.u64 = (_value), \
+         .file_ops = &aa_fs_seq_file_ops }
+#define AA_FS_FILE_FOPS(_name, _mode, _fops) \
+       { .name = (_name), .v_type = AA_FS_TYPE_FOPS, \
+         .mode = (_mode), .file_ops = (_fops) }
+#define AA_FS_DIR(_name, _value) \
+       { .name = (_name), .v_type = AA_FS_TYPE_DIR, .v.files = (_value) }
+
 extern void __init aa_destroy_aafs(void);
 
 #endif /* __AA_APPARMORFS_H */