Branch HEAD

Branch b_release_1_6_6
b=16303
i=adilger
Description: Oops in statahead when CONFIG_SLUB is enabled
Details    : Disable statahead by default on systems with CONFIG_SLUB enabled,
             until such a time as problem is understood.

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 8631e1e..d4f8a24 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -1061,7 +1061,11 @@ void et_fini(struct eacl_table *et);
 /* statahead.c */
 
 #define LL_SA_RPC_MIN   2
+#ifdef CONFIG_SLUB /* can be removed once bug 16303 is fixed */
+#define LL_SA_RPC_DEF   0
+#else
 #define LL_SA_RPC_DEF   32
+#endif
 #define LL_SA_RPC_MAX   8192
 
 /* per inode struct, for dir only */