Move definition of LP[DUX]64 to lustre_lib.h so we can use it in obd.c

diff --git a/lustre/include/linux/lustre_lib.h b/lustre/include/linux/lustre_lib.h
index 3d0e5f1..d59a526 100644 (file)
--- a/lustre/include/linux/lustre_lib.h
+++ b/lustre/include/linux/lustre_lib.h
@@ -34,6 +34,16 @@
 #include <linux/portals_lib.h>
 #include <linux/lustre_idl.h>
 
+#if BITS_PER_LONG > 32
+#define LPU64 "%lu"
+#define LPD64 "%ld"
+#define LPX64 "%#lx"
+#else
+#define LPU64 "%Lu"
+#define LPD64 "%Ld"
+#define LPX64 "%#Lx"
+#endif
+
 #ifdef __KERNEL__
 /* l_net.c */
 struct ptlrpc_request;

diff --git a/lustre/include/linux/obd.h b/lustre/include/linux/obd.h
index ec9fde8..f74c2b3 100644 (file)
--- a/lustre/include/linux/obd.h
+++ b/lustre/include/linux/obd.h
@@ -311,16 +311,6 @@ struct obd_ops {
         int (*o_cancel)(struct lustre_handle *, struct lov_stripe_md *md, __u32 mode, struct lustre_handle *);
 };
 
-#if BITS_PER_LONG > 32
-#define LPU64 "%lu"
-#define LPD64 "%ld"
-#define LPX64 "%#lx"
-#else
-#define LPU64 "%Lu"
-#define LPD64 "%Ld"
-#define LPX64 "%#Lx"
-#endif
-
 static inline void *mds_fs_start(struct mds_obd *mds, struct inode *inode,
                                  int op)
 {