From: Andrew Morton Cc: Stephen Smalley Signed-off-by: Andrew Morton --- fs/ext3/xattr.h | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletion(-) diff -puN fs/ext3/xattr.h~ext3-enable-atomic-inode-security-labeling-fix fs/ext3/xattr.h --- 25/fs/ext3/xattr.h~ext3-enable-atomic-inode-security-labeling-fix 2005-07-12 05:02:43.000000000 -0600 +++ 25-akpm/fs/ext3/xattr.h 2005-07-12 05:18:06.000000000 -0600 @@ -67,7 +67,6 @@ extern struct xattr_handler ext3_xattr_s extern ssize_t ext3_listxattr(struct dentry *, char *, size_t); -extern int ext3_init_security(handle_t *handle, struct inode *inode, struct inode *dir); extern int ext3_xattr_get(struct inode *, int, const char *, void *, size_t); extern int ext3_xattr_list(struct inode *, char *, size_t); extern int ext3_xattr_set(struct inode *, int, const char *, const void *, size_t, int); @@ -134,3 +133,14 @@ exit_ext3_xattr(void) #define ext3_xattr_handlers NULL # endif /* CONFIG_EXT3_FS_XATTR */ + +#ifdef CONFIG_EXT3_FS_SECURITY +extern int ext3_init_security(handle_t *handle, struct inode *inode, + struct inode *dir); +#else +static inline int ext3_init_security(handle_t *handle, struct inode *inode, + struct inode *dir) +{ + return 0; +} +#endif _