Messages in this thread Patch in this message | | | From | Mimi Zohar <> | Subject | [PATCH v1.2 5/5] IMA: making i_readcount a first class inode citizen | Date | Thu, 18 Nov 2010 18:03:02 -0500 |
| |
Finally, remove the ifdef's around i_readcount, making it a full inode citizen so that other subsystems, such as leases, could use it.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com> --- include/linux/fs.h | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/include/linux/fs.h b/include/linux/fs.h index 6b7e2fb..1024da1 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -786,9 +786,7 @@ struct inode { unsigned int i_flags; -#ifdef CONFIG_IMA atomic_t i_readcount; /* struct files open RO */ -#endif atomic_t i_writecount; #ifdef CONFIG_SECURITY void *i_security; @@ -2176,7 +2174,7 @@ static inline void allow_write_access(struct file *file) if (file) atomic_inc(&file->f_path.dentry->d_inode->i_writecount); } -#ifdef CONFIG_IMA + static inline void i_readcount_dec(struct inode *inode) { BUG_ON(!atomic_read(&inode->i_readcount)); @@ -2186,16 +2184,7 @@ static inline void i_readcount_inc(struct inode *inode) { atomic_inc(&inode->i_readcount); } -#else -static inline void i_readcount_dec(struct inode *inode) -{ - return; -} -static inline void i_readcount_inc(struct inode *inode) -{ - return; -} -#endif + extern int do_pipe_flags(int *, int); extern struct file *create_read_pipe(struct file *f, int flags); extern struct file *create_write_pipe(int flags); -- 1.7.2.2
| |