b=23122 Get ia64/rhel5 build successful.

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 07fb2ce..c1ba576 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -175,6 +175,7 @@ AC_DEFUN([LIBCFS_U64_LONG_LONG],
 tmp_flags="$CFLAGS"
 CFLAGS="$CFLAGS -Werror"
 AC_COMPILE_IFELSE([
+       #include <stdio.h>
        #include <linux/types.h>
        #include <linux/stddef.h>
        int main(void) {

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 9ef782f..509ef82 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -1596,7 +1596,7 @@ void ll_update_inode(struct inode *inode, struct lustre_md *md)
                         inode->i_size = body->size;
 
                         CDEBUG(D_VFSTRACE, "inode=%lu, updating i_size %llu\n",
-                               inode->i_ino, body->size);
+                               inode->i_ino, (unsigned long long)body->size);
                 }
 
                 if (body->valid & OBD_MD_FLBLOCKS)

diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c
index 2034759..ff9f4d2 100644 (file)
--- a/lustre/llite/vvp_io.c
+++ b/lustre/llite/vvp_io.c
@@ -991,8 +991,9 @@ static int vvp_io_commit_write(const struct lu_env *env,
         if (result == 0) {
                 if (size > i_size_read(inode)) {
                         cl_isize_write_nolock(inode, size);
-                        CDEBUG(D_VFSTRACE, DFID" updating i_size "LPU64"\n",
-                               PFID(lu_object_fid(&obj->co_lu)), size);
+                        CDEBUG(D_VFSTRACE, DFID" updating i_size %lu\n",
+                               PFID(lu_object_fid(&obj->co_lu)),
+                               (unsigned long)size);
                 }
                 cl_page_export(env, pg, 1);
         } else {

diff --git a/lustre/mdd/mdd_orphans.c b/lustre/mdd/mdd_orphans.c
index 326e0b0..12953a2 100644 (file)
--- a/lustre/mdd/mdd_orphans.c
+++ b/lustre/mdd/mdd_orphans.c
@@ -86,8 +86,8 @@ static struct dt_key* orph_key_fill_18(const struct lu_env *env,
         int rc;
 
         LASSERT(key);
-        rc = snprintf(key, NAME_MAX + 1, ORPHAN_FILE_NAME_FORMAT_18, fid_seq(lf),
-                      fid_oid(lf));
+        rc = snprintf(key, NAME_MAX + 1, ORPHAN_FILE_NAME_FORMAT_18,
+                      (unsigned long long)fid_seq(lf), fid_oid(lf));
         if (rc > 0)
                 return (struct dt_key*) key;
         else

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index aec469b..c47af49 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -451,7 +451,7 @@ void mdt_pack_attr2body(struct mdt_thread_info *info, struct mdt_body *b,
 
         if (b->valid & OBD_MD_FLSIZE)
                 CDEBUG(D_VFSTRACE, DFID": returning size %llu\n",
-                       PFID(fid), b->size);
+                       PFID(fid), (unsigned long long)b->size);
 }
 
 static inline int mdt_body_has_lov(const struct lu_attr *la,

diff --git a/lustre/mdt/mdt_lib.c b/lustre/mdt/mdt_lib.c
index b513d44..07ce5ab 100644 (file)
--- a/lustre/mdt/mdt_lib.c
+++ b/lustre/mdt/mdt_lib.c
@@ -572,10 +572,10 @@ void mdt_shrink_reply(struct mdt_thread_info *info)
         }
 
         CDEBUG(D_INFO, "Shrink to md_size = %d cookie/acl_size = %d"
-                        " MDSCAPA = "LPX64", OSSCAPA = "LPX64"\n",
+                        " MDSCAPA = %llx, OSSCAPA = %llx\n",
                         md_size, acl_size,
-                        body->valid & OBD_MD_FLMDSCAPA,
-                        body->valid & OBD_MD_FLOSSCAPA);
+                        (unsigned long long)(body->valid & OBD_MD_FLMDSCAPA),
+                        (unsigned long long)(body->valid & OBD_MD_FLOSSCAPA));
 /*
             &RMF_MDT_BODY,
             &RMF_MDT_MD,