Fix compiler warnings. (Specific to x86_64)

b=15981
i=adilger
i=robert.read

diff --git a/lustre/liblustre/rw.c b/lustre/liblustre/rw.c
index 7287e77..139d441 100644 (file)
--- a/lustre/liblustre/rw.c
+++ b/lustre/liblustre/rw.c
@@ -206,7 +206,7 @@ static int llu_glimpse_callback(struct ldlm_lock *lock, void *reqp)
         lvb = req_capsule_server_get(&req->rq_pill, &RMF_DLM_LVB);
         lvb->lvb_size = lli->lli_smd->lsm_oinfo[stripe]->loi_kms;
 
-        LDLM_DEBUG(lock, "i_size: %llu -> stripe number %u -> kms "LPU64,
+        LDLM_DEBUG(lock, "i_size: "LPU64" -> stripe number %u -> kms "LPU64,
                    (__u64)llu_i2stat(inode)->st_size, stripe,lvb->lvb_size);
  iput:
         I_RELE(inode);
@@ -340,7 +340,7 @@ int llu_extent_lock(struct ll_file_data *fd, struct inode *inode,
                 RETURN(0);
 
         CDEBUG(D_DLMTRACE, "Locking inode %llu, start "LPU64" end "LPU64"\n",
-               (__u64)st->st_ino, policy->l_extent.start,
+               (unsigned long long)st->st_ino, policy->l_extent.start,
                policy->l_extent.end);
 
         einfo.ei_type = LDLM_EXTENT;

diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c
index 8525b92..1dd6860 100644 (file)
--- a/lustre/liblustre/super.c
+++ b/lustre/liblustre/super.c
@@ -691,7 +691,7 @@ static int llu_setattr_done_writing(struct inode *inode,
                                           op_data->op_ioepoch);
         } else if (rc) {
                 CERROR("inode %llu mdc truncate failed: rc = %d\n",
-                       st->st_ino, rc);
+                       (unsigned long long)st->st_ino, rc);
         }
         RETURN(rc);
 }

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 920a0ca..d658ca6 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -2202,7 +2202,7 @@ static __u32 lmv_node_rank(struct obd_export *exp, const struct lu_fid *fid)
         imp  = class_exp2cliimp(exp);
         id   = imp->imp_connection->c_self + fid_flatten(fid);
 
-        CDEBUG(D_INFO, "node rank: %llx "DFID" %llx %llx\n",
+        CDEBUG(D_INFO, "node rank: "LPX64" "DFID" "LPX64" "LPX64"\n",
                imp->imp_connection->c_self, PFID(fid), id, id ^ (id >> 32));
 
         return id ^ (id >> 32);
@@ -2234,7 +2234,7 @@ static int lmv_readpage(struct obd_export *exp, const struct lu_fid *fid,
         if (rc)
                 RETURN(rc);
 
-        CDEBUG(D_INFO, "READPAGE at %llx from "DFID"\n", offset, PFID(&rid));
+        CDEBUG(D_INFO, "READPAGE at "LPX64" from "DFID"\n", offset, PFID(&rid));
 
         obj = lmv_obj_grab(obd, fid);
         if (obj) {
@@ -2289,7 +2289,7 @@ static int lmv_readpage(struct obd_export *exp, const struct lu_fid *fid,
 
                 hash_adj += rank * seg_size;
 
-                CDEBUG(D_INFO, "hash_adj: %x %llx %llx/%x -> %llx/%x\n",
+                CDEBUG(D_INFO, "hash_adj: %x "LPX64" "LPX64"/%x -> "LPX64"/%x\n",
                        rank, hash_adj, offset, tgt0, offset + hash_adj, tgt);
 
                 offset = (offset + hash_adj) & MAX_HASH_SIZE;
@@ -2328,7 +2328,8 @@ static int lmv_readpage(struct obd_export *exp, const struct lu_fid *fid,
                         if (end == DIR_END_OFF) {
                                 dp->ldp_hash_end = cpu_to_le32(seg_size *
                                                                (tgt0 + 1));
-                                CDEBUG(D_INFO, ""DFID" reset end %llx tgt %d\n",
+                                CDEBUG(D_INFO,
+                                       ""DFID" reset end "LPX64" tgt %d\n",
                                        PFID(&rid),
                                        le64_to_cpu(dp->ldp_hash_end), tgt);
                         }

diff --git a/lustre/utils/l_getidentity.c b/lustre/utils/l_getidentity.c
index 7ab7937..40e6333 100644 (file)
--- a/lustre/utils/l_getidentity.c
+++ b/lustre/utils/l_getidentity.c
@@ -363,7 +363,7 @@ static void show_result(struct identity_downcall_data *data)
 
                 pdd = &data->idd_perms[i];
 
-                printf("  %#llx\t0x%x\n", pdd->pdd_nid, pdd->pdd_perm);
+                printf("  "LPX64"\t0x%x\n", pdd->pdd_nid, pdd->pdd_perm);
         }
         printf("\n");
 }