Branch b1_6

b=16303
i=nikita
i=johann

Remove old patch.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index fd07e84..3f7b85d 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -652,8 +652,8 @@ 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.
+Details    : Do not drop reference count for the dentry from VFS when lookup,
+            VFS will do that by itself.
 
 Severity   : major
 Bugzilla   : 17024

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index f24478a..d004c38 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -899,11 +899,7 @@ 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 */