Add 0x prefix to hex numbers.

diff --git a/lustre/include/linux/obd.h b/lustre/include/linux/obd.h
index 2d50867..ec9fde8 100644 (file)
--- a/lustre/include/linux/obd.h
+++ b/lustre/include/linux/obd.h
@@ -314,11 +314,11 @@ struct obd_ops {
 #if BITS_PER_LONG > 32
 #define LPU64 "%lu"
 #define LPD64 "%ld"
-#define LPX64 "%lx"
+#define LPX64 "%#lx"
 #else
 #define LPU64 "%Lu"
 #define LPD64 "%Ld"
-#define LPX64 "%Lx"
+#define LPX64 "%#Lx"
 #endif
 
 static inline void *mds_fs_start(struct mds_obd *mds, struct inode *inode,

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index cf4ec22..b1f3c68 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -826,7 +826,7 @@ static int obd_class_ioctl (struct inode * inode, struct file * filp,
                 pages = data->ioc_count / PAGE_SIZE;
                 off = data->ioc_offset;
 
-                CDEBUG(D_INODE, "BRW %s with %d pages @ 0x"LPX64"\n",
+                CDEBUG(D_INODE, "BRW %s with %d pages @ "LPX64"\n",
                        rw == OBD_BRW_READ ? "read" : "write", pages, off);
                 OBD_ALLOC(pga, pages * sizeof(*pga));
                 if (!pga) {

diff --git a/lustre/obdecho/echo.c b/lustre/obdecho/echo.c
index d3d3f5b..c9d8f62 100644 (file)
--- a/lustre/obdecho/echo.c
+++ b/lustre/obdecho/echo.c
@@ -12,8 +12,8 @@
  * and Andreas Dilger <adilger@clusterfs.com>
  */
 
-static char rcsid[] __attribute ((unused)) = "$Id: echo.c,v 1.36 2002/09/08 20:05:15 pschwan Exp $";
-#define OBDECHO_VERSION "$Revision: 1.36 $"
+static char rcsid[] __attribute ((unused)) = "$Id: echo.c,v 1.37 2002/09/11 05:17:03 adilger Exp $";
+#define OBDECHO_VERSION "$Revision: 1.37 $"
 
 #define EXPORT_SYMTAB
 
@@ -169,7 +169,7 @@ int echo_destroy(struct lustre_handle *conn, struct obdo *oa,
         }
 
         if (oa->o_id > obd->u.echo.eo_lastino || oa->o_id < ECHO_INIT_OBJID) {
-                CERROR("bad destroy objid: 0x"LPX64"\n", oa->o_id);
+                CERROR("bad destroy objid: "LPX64"\n", oa->o_id);
                 RETURN(-EINVAL);
         }
 

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 60e6a18..7b260d5 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -668,7 +668,7 @@ static int filter_destroy(struct lustre_handle *conn, struct obdo *oa,
 
         inode = object_dentry->d_inode;
         if (inode == NULL) {
-                CERROR("trying to destroy negative inode "LPD64"!\n", oa->o_id);
+                CERROR("trying to destroy negative inode "LPX64"!\n", oa->o_id);
                 GOTO(out, rc = -ENOENT);
         }
 

diff --git a/lustre/tests/test_brw.c b/lustre/tests/test_brw.c
index 66bfc5f..196f32c 100644 (file)
--- a/lustre/tests/test_brw.c
+++ b/lustre/tests/test_brw.c
@@ -21,7 +21,7 @@
 
 #ifndef LPU64
 #define LPU64 "%Lu"
-#define LPX64 "%Lx"
+#define LPX64 "%#Lx"
 #endif
 
 #define READ  1
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
                }
        }
 
-        printf("%s: %s on %s(objid 0x"LPX64") for "LPU64"x%ld pages \n",
+        printf("%s: %s on %s(objid "LPX64") for "LPU64"x%ld pages \n",
               argv[0], flags & O_DIRECT ? "directio" : "i/o",
               argv[1], objid, count, pg_vec);