From: Andreas Gruenbacher <[email protected]>

if CONFIG_FS_RICHACL is not defined optimize out
the ACL check function.

Signed-off-by: Andreas Gruenbacher <[email protected]>
Signed-off-by: Aneesh Kumar K.V <[email protected]>
---
 fs/Kconfig         | 3 +++
 include/linux/fs.h | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/fs/Kconfig b/fs/Kconfig
index 312393f32948..facd968f8e84 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -50,6 +50,9 @@ endif # BLOCK
 config FS_POSIX_ACL
        def_bool n
 
+config FS_RICHACL
+       def_bool n
+
 config EXPORTFS
        tristate
 
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 1a7fe920f956..1f524b4b652d 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1601,7 +1601,12 @@ struct super_operations {
 #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.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to