Merge branch 'aufs5.2.5+/30stdalone' into aufs5.2.5+/39public

Documentation/filesystems/aufs/README

@@ -272,7 +272,8 @@ optional. When you meet some problems, they will help you.
   the internal locks for LOCKDEP is necessary. LOCKDEP is a debugging
   feature of linux kernel. If you enable CONFIG_LOCKDEP, then you will
   need to apply this debug patch to expand several constant values.
-  If don't know what LOCKDEP is, then you don't have apply this patch.
+  If you don't know what LOCKDEP is, then you don't have apply this
+  patch.
 
 
 4. Usage

fs/aufs/dirren.c

@@ -1215,8 +1215,8 @@ int au_dr_lkup_name(struct au_do_lookup_args *lkup, aufs_bindex_t btgt)
 	err = 0;
 	if (!lkup->dirren.drinfo)
 		goto out;
-	AuDebugOn(lkup->dirren.ninfo < btgt + 1);
-	drinfo = lkup->dirren.drinfo[btgt + 1];
+	AuDebugOn(lkup->dirren.ninfo <= btgt);
+	drinfo = lkup->dirren.drinfo[btgt];
 	if (!drinfo)
 		goto out;
 
@@ -1245,8 +1245,8 @@ int au_dr_lkup_h_ino(struct au_do_lookup_args *lkup, aufs_bindex_t bindex,
 	match = 1;
 	if (!lkup->dirren.drinfo)
 		goto out;
-	AuDebugOn(lkup->dirren.ninfo < bindex + 1);
-	drinfo = lkup->dirren.drinfo[bindex + 1];
+	AuDebugOn(lkup->dirren.ninfo <= bindex);
+	drinfo = lkup->dirren.drinfo[bindex];
 	if (!drinfo)
 		goto out;
 

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