diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /fs/ext2/xattr.h | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/ext2/xattr.h')
| -rw-r--r-- | fs/ext2/xattr.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/ext2/xattr.h b/fs/ext2/xattr.h index 5f3bfde3b810..67cfeb66e897 100644 --- a/fs/ext2/xattr.h +++ b/fs/ext2/xattr.h | |||
| @@ -116,3 +116,11 @@ exit_ext2_xattr(void) | |||
| 116 | 116 | ||
| 117 | # endif /* CONFIG_EXT2_FS_XATTR */ | 117 | # endif /* CONFIG_EXT2_FS_XATTR */ |
| 118 | 118 | ||
| 119 | #ifdef CONFIG_EXT2_FS_SECURITY | ||
| 120 | extern int ext2_init_security(struct inode *inode, struct inode *dir); | ||
| 121 | #else | ||
| 122 | static inline int ext2_init_security(struct inode *inode, struct inode *dir) | ||
| 123 | { | ||
| 124 | return 0; | ||
| 125 | } | ||
| 126 | #endif | ||