diff options
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 4caec6cebc42..6eafbe309483 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -553,7 +553,9 @@ struct inode { | |||
553 | unsigned int i_flags; | 553 | unsigned int i_flags; |
554 | 554 | ||
555 | atomic_t i_writecount; | 555 | atomic_t i_writecount; |
556 | #ifdef CONFIG_SECURITY | ||
556 | void *i_security; | 557 | void *i_security; |
558 | #endif | ||
557 | void *i_private; /* fs or device private pointer */ | 559 | void *i_private; /* fs or device private pointer */ |
558 | #ifdef __NEED_I_SIZE_ORDERED | 560 | #ifdef __NEED_I_SIZE_ORDERED |
559 | seqcount_t i_size_seqcount; | 561 | seqcount_t i_size_seqcount; |
@@ -645,7 +647,6 @@ struct fown_struct { | |||
645 | rwlock_t lock; /* protects pid, uid, euid fields */ | 647 | rwlock_t lock; /* protects pid, uid, euid fields */ |
646 | int pid; /* pid or -pgrp where SIGIO should be sent */ | 648 | int pid; /* pid or -pgrp where SIGIO should be sent */ |
647 | uid_t uid, euid; /* uid/euid of process setting the owner */ | 649 | uid_t uid, euid; /* uid/euid of process setting the owner */ |
648 | void *security; | ||
649 | int signum; /* posix.1b rt signal to be delivered on IO */ | 650 | int signum; /* posix.1b rt signal to be delivered on IO */ |
650 | }; | 651 | }; |
651 | 652 | ||
@@ -688,8 +689,9 @@ struct file { | |||
688 | struct file_ra_state f_ra; | 689 | struct file_ra_state f_ra; |
689 | 690 | ||
690 | unsigned long f_version; | 691 | unsigned long f_version; |
692 | #ifdef CONFIG_SECURITY | ||
691 | void *f_security; | 693 | void *f_security; |
692 | 694 | #endif | |
693 | /* needed for tty driver, and maybe others */ | 695 | /* needed for tty driver, and maybe others */ |
694 | void *private_data; | 696 | void *private_data; |
695 | 697 | ||
@@ -877,7 +879,9 @@ struct super_block { | |||
877 | int s_syncing; | 879 | int s_syncing; |
878 | int s_need_sync_fs; | 880 | int s_need_sync_fs; |
879 | atomic_t s_active; | 881 | atomic_t s_active; |
882 | #ifdef CONFIG_SECURITY | ||
880 | void *s_security; | 883 | void *s_security; |
884 | #endif | ||
881 | struct xattr_handler **s_xattr; | 885 | struct xattr_handler **s_xattr; |
882 | 886 | ||
883 | struct list_head s_inodes; /* all inodes */ | 887 | struct list_head s_inodes; /* all inodes */ |