From 830142b3f4c3a4dbd55532024cfd49fb74a81b32 Mon Sep 17 00:00:00 2001
From: johann <johann>
Date: Wed, 2 Apr 2008 20:06:26 +0000
Subject: [PATCH] Branch b1_6 b=14855 i=shadow i=adilger

On SLES10/PPC, fs.h includes idr.h which requires BITS_PER_LONG to
be defined. Add a hack in mkfs_lustre.c to work around this compile
issue.
---
 lustre/ChangeLog           | 20 ++++++++++++++------
 lustre/utils/mkfs_lustre.c |  3 +++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 0161f78265..f910d1f3c5 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -27,17 +27,17 @@ Bugzilla   : 15027
 Frequency  : on network error
 Description: panic with double free request if network error 
 Details    : mdc_finish_enqueue is finish request if any network error occuring,
-             but it's true only for synchronus enqueue, for async enqueue 
-             (via ptlrpcd) this incorrect and ptlrpcd want finish request
-             himself.
+	     but it's true only for synchronus enqueue, for async enqueue 
+	     (via ptlrpcd) this incorrect and ptlrpcd want finish request
+	     himself.
 
 Severity   : normal
 Bugzilla   : 14533
 Frequency  : rare, on recovery
 Description: read procfs can produce deadlock in some situation
 Details    : Holding lprocfs lock with send rpc can produce block for destroy
-             obd objects and this also block reconnect with -EALREADY. This isn't
-             fix all lprocfs bugs - but make it rare.
+	     obd objects and this also block reconnect with -EALREADY. This isn't
+	     fix all lprocfs bugs - but make it rare.
 
 Severity   : enhancement
 Bugzilla   : 15152
@@ -53,7 +53,7 @@ Severity   : normal
 Bugzilla   : 14321
 Description: lustre_mgs: operation 101 on unconnected MGS
 Details    : When MGC is disconnected from MGS long enough, MGS will evict the
-             MGC, and late on MGC cannot successfully connect to MGS and a lot
+	     MGC, and late on MGC cannot successfully connect to MGS and a lot
 	     of the error messages complaining that MGS is not connected.
 
 Severity   : enhancement
@@ -463,6 +463,14 @@ Bugzilla   : 13371
 Description: implement readv/writev APIs(aio_read/aio_writes in newer kernels)
 Details    : This greatly improves speed of NFS writes on 2.6 kernels.
 
+Severity   : normal
+Frequency  : only on PPC/SLES10
+Bugzilla   : 14855
+Description: "BITS_PER_LONG is not 32 or 64" in linux/idr.h
+Details    : On SLES10/PPC, fs.h includes idr.h which requires BITS_PER_LONG to
+	     be defined. Add a hack in mkfs_lustre.c to work around this compile
+	     issue.
+
 --------------------------------------------------------------------------------
 
 2007-12-07         Cluster File Systems, Inc. <info@clusterfs.com>
diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index 0b1880f54a..d872ecf636 100644
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -40,6 +40,9 @@
 #include <limits.h>
 
 #ifdef __linux__
+/* kp30.h is not really needed here, but on SLES10/PPC, fs.h includes idr.h which
+ * requires BITS_PER_LONG to be defined */
+#include <libcfs/kp30.h>
 #include <linux/fs.h> /* for BLKGETSIZE64 */
 #include <linux/version.h>
 #endif
-- 
GitLab