Skip to content

GitLab

Commit 31ce55b7 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

Merge branch 'aufs5.2/30stdalone' into aufs5.2.5+/30stdalone

parents 4ddbb84f f0d6c58e
Hide whitespace changes
Inline Side-by-side
include/uapi/linux/aufs_type.h
View file @ 31ce55b7
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
#ifdef __KERNEL__
#ifdef CONFIG_AUFS_BRANCH_MAX_127 #ifdef CONFIG_AUFS_BRANCH_MAX_127
typedef int8_t aufs_bindex_t; typedef int8_t aufs_bindex_t;
#define AUFS_BRANCH_MAX 127 #define AUFS_BRANCH_MAX 127
...@@ -61,7 +62,6 @@ typedef int16_t aufs_bindex_t; ...@@ -61,7 +62,6 @@ typedef int16_t aufs_bindex_t;
#endif #endif
#endif #endif
#ifdef __KERNEL__
#ifndef AUFS_BRANCH_MAX #ifndef AUFS_BRANCH_MAX
#error unknown CONFIG_AUFS_BRANCH_MAX value #error unknown CONFIG_AUFS_BRANCH_MAX value
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment