LU-4669 type: change "%Lu" and "%Lx" to "LPU64” and "LPX64"

"%Lu" and "%Lx" are not supported by standard C. This patch
fixes these formats with "LPU64" and "LPX64".

Signed-off-by: Jian Yu <jian.yu@intel.com>
Change-Id: Ic10346575161c55b299cce6576029c16d59fe60f
Reviewed-on: http://review.whamcloud.com/9921
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>

diff --git a/lnet/klnds/gnilnd/gnilnd_aries.h b/lnet/klnds/gnilnd/gnilnd_aries.h
index d0a1e69..98e078c 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_aries.h
+++ b/lnet/klnds/gnilnd/gnilnd_aries.h
@@ -74,7 +74,8 @@ kgnilnd_nid_to_nicaddrs(__u32 nid, int numnic, __u32 *nicaddr)
                return -EINVAL;
        }
        if (nid < kgnilnd_data.kgn_nid_trans_private) {
-               CERROR("Request for invalid nid translation %u, minimum %Lu\n",
+               CERROR("Request for invalid nid translation %u,"
+                      "minimum "LPU64"\n",
                       nid, kgnilnd_data.kgn_nid_trans_private);
                return -ESRCH;
        }

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 418464e..4fa91dc 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -872,7 +872,7 @@ ll_lease_open(struct inode *inode, struct file *file, fmode_t fmode,
        if (it.d.lustre.it_lock_mode == 0 ||
            it.d.lustre.it_lock_bits != MDS_INODELOCK_OPEN) {
                /* open lock must return for lease */
-               CERROR(DFID "lease granted but no open lock, %d/%Lu.\n",
+               CERROR(DFID "lease granted but no open lock, %d/"LPU64".\n",
                        PFID(ll_inode2fid(inode)), it.d.lustre.it_lock_mode,
                        it.d.lustre.it_lock_bits);
                GOTO(out_close, rc = -EPROTO);

diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c
index 18d5843..98a3880 100644 (file)
--- a/lustre/obdclass/llog_test.c
+++ b/lustre/obdclass/llog_test.c
@@ -914,10 +914,10 @@ static int llog_truncate(const struct lu_env *env, struct dt_object *o)
        if (rc)
                RETURN(rc);
 
-       CDEBUG(D_OTHER, "original size %Lu\n", la.la_size);
+       CDEBUG(D_OTHER, "original size "LPU64"\n", la.la_size);
        rc = sizeof(struct llog_log_hdr) + sizeof(struct llog_mini_rec);
        if (la.la_size < rc) {
-               CERROR("too small llog: %Lu\n", la.la_size);
+               CERROR("too small llog: "LPU64"\n", la.la_size);
                RETURN(0);
        }
 

diff --git a/lustre/osd-zfs/osd_index.c b/lustre/osd-zfs/osd_index.c
index cbf391c..ee95d01 100644 (file)
--- a/lustre/osd-zfs/osd_index.c
+++ b/lustre/osd-zfs/osd_index.c
@@ -1195,7 +1195,8 @@ static int osd_index_it_get(const struct lu_env *env, struct dt_it *di,
         * XXX: we need a binary version of zap_cursor_move_to_key()
         *      to implement this API */
        if (*((const __u64 *)key) != 0)
-               CERROR("NOT IMPLEMETED YET (move to %Lx)\n", *((__u64 *)key));
+               CERROR("NOT IMPLEMETED YET (move to "LPX64")\n",
+                      *((__u64 *)key));
 
        zap_cursor_fini(it->ozi_zc);
        memset(it->ozi_zc, 0, sizeof(*it->ozi_zc));