Branch b1_6

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/ChangeLog b/lustre/ChangeLog
index f2a852c..de404dc 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -643,6 +643,13 @@ Bugzilla   : 16813
 Description: X2 build failures
 Details    : fix build failures on Cray X2.
 
+Severity   : major
+Frequency  : Only on FC kernels 2.6.22+
+Bugzilla   : 16303
+Description: oops in statahead
+Details    : Disable statahead 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 d004c38..f24478a 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -899,7 +899,11 @@ int ll_removexattr(struct dentry *dentry, const char *name);
 /* 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 */