From: Andreas Gruenbacher <agruen@xxxxxxx> if CONFIG_FS_RICHACL is not defined optimize out the ACL check function. Signed-off-by: Andreas Gruenbacher <agruen@xxxxxxx> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> --- fs/Kconfig | 4 ++++ include/linux/fs.h | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/fs/Kconfig b/fs/Kconfig index 3d18530..cd283dc 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -39,6 +39,10 @@ config FS_POSIX_ACL bool default n +config FS_RICHACL + bool + default n + source "fs/xfs/Kconfig" source "fs/gfs2/Kconfig" source "fs/ocfs2/Kconfig" diff --git a/include/linux/fs.h b/include/linux/fs.h index d86e77c..26fc8ae 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -265,7 +265,12 @@ struct inodes_stat_t { #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND) #define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE) #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL) + +#ifdef CONFIG_FS_RICHACL #define IS_RICHACL(inode) __IS_FLG(inode, MS_RICHACL) +#else +#define IS_RICHACL(inode) 0 +#endif #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD) #define IS_NOCMTIME(inode) ((inode)->i_flags & S_NOCMTIME) -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html