Branch b1_6

b=14845
i=shadow
i=deen

fix duplicated definitions between asm-ppc64/types.h and lustre_types.h on PPC.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index eb923db..11cf07a 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -61,7 +61,7 @@ Description: If llog cancel was not send before clean_exports phase, this can
             produce deadlock in llog code.
 Details    : If llog thread has last reference to obd and call class_import_put
             this produce deadlock because llog_cleanup_commit_master wait when
-            last llog_commit_thread exited, but this never success because was 
+            last llog_commit_thread exited, but this never success because was
             called from llog_commit_thread.
 
 Severity   : normal
@@ -134,7 +134,7 @@ Severity   : normal
 Frequency  : very rare
 Bugzilla   : 3462
 Description: Fix replay if there is an un-replied request and open
-Details    : In some cases, older replay request will revert the 
+Details    : In some cases, older replay request will revert the
             mcd->mcd_last_xid on MDS which is used to record the client's
             latest sent request.
 
@@ -257,7 +257,7 @@ Severity   : normal
 Bugzilla   : 14477
 Description: Hit ASSERTION(obd->obd_stopping == 1) failed in some setup failed
             situation.
-Details    : In obd setup failure handler, obd_stopping will not necessarily to 
+Details    : In obd setup failure handler, obd_stopping will not necessarily to
             be 1, and obd_set_up should also be checked to make sure whether
             obd is completely setup.
 
@@ -322,6 +322,13 @@ Details    : A performance regression has been discovered in the MPT Fusion
             consequence, we have downgraded the MPT Fusion driver in the RHEL4
             kernel from 3.02.99.00 to 3.02.73 until this problem is fixed.
 
+Severity   : normal
+Frequency  : PPC/PPC64 only
+Bugzilla   : 14845
+Description: conflicts between asm-ppc64/types.h and lustre_types.h
+Details    : fix duplicated definitions between asm-ppc64/types.h and
+            lustre_types.h on PPC.
+
 --------------------------------------------------------------------------------
 
 2007-12-07         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/include/linux/lustre_types.h b/lustre/include/linux/lustre_types.h
index 6d9f106..0525925 100644 (file)
--- a/lustre/include/linux/lustre_types.h
+++ b/lustre/include/linux/lustre_types.h
@@ -22,7 +22,7 @@
         !defined(_EXT2_TYPES_H) && !defined(_I386_TYPES_H) && \
         !defined(_ASM_IA64_TYPES_H) && !defined(_X86_64_TYPES_H) && \
         !defined(_PPC_TYPES_H) && !defined(_PPC64_TYPES_H) && \
-        !defined(__mips64__)
+        !defined(_ASM_POWERPC_TYPES_H) && !defined(__mips64__)
         /* yuck, would be nicer with _ASM_TYPES_H */
 
 typedef unsigned short umode_t;