Branch HEAD

b=16303
i=nikita
i=johann

Remove old patch.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 8757d4a..c7fe06f 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -12,6 +12,13 @@ tbd  Sun Microsystems, Inc.
        * RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
         removed cwd "./" (refer to Bugzilla 14399).
 
+Severity   : major
+Frequency  : Only on FC kernels 2.6.22+
+Bugzilla   : 16303
+Description: oops in statahead
+Details    : Do not drop reference count for the dentry from VFS when lookup,
+            VFS will do that by itself.
+
 Severity   : enhancement
 Bugzilla   : 16643
 Description: Generic /proc file permissions

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