Merge branch 'aufs5.0/01modular' into aufs5.0/30stdalone

182c6af2 · J. R. Okajima · 4d430b32 · b3ac1e63 · 182c6af2
Commit 182c6af2 authored Dec 18, 2019 by J. R. Okajima
--- a/include/uapi/linux/aufs_type.h
+++ b/include/uapi/linux/aufs_type.h
@@ -47,6 +47,7 @@

 /* ---------------------------------------------------------------------- */

+#ifdef __KERNEL__
 #ifdef CONFIG_AUFS_BRANCH_MAX_127
 typedef int8_t aufs_bindex_t;
 #define AUFS_BRANCH_MAX 127
@@ -61,7 +62,6 @@ typedef int16_t aufs_bindex_t;
 #endif
 #endif

-#ifdef __KERNEL__
 #ifndef AUFS_BRANCH_MAX
 #error unknown CONFIG_AUFS_BRANCH_MAX value
 #endif