LU-6245 client: remove types abstraction from client code

[fs/lustre-release.git] / lustre / obdecho / echo.c

diff --git a/lustre/obdecho/echo.c b/lustre/obdecho/echo.c
index 65842d1..622c6eb 100644 (file)
--- a/lustre/obdecho/echo.c
+++ b/lustre/obdecho/echo.c
@@ -122,7 +122,7 @@ static int echo_create(const struct lu_env *env, struct obd_export *exp,
         struct obd_device *obd = class_exp2obd(exp);
 
         if (!obd) {
-                CERROR("invalid client cookie "LPX64"\n",
+               CERROR("invalid client cookie %#llx\n",
                        exp->exp_handle.h_cookie);
                 return -EINVAL;
         }
@@ -133,7 +133,7 @@ static int echo_create(const struct lu_env *env, struct obd_export *exp,
        }
 
         if (!(oa->o_valid & OBD_MD_FLTYPE)) {
-                CERROR("invalid o_valid "LPX64"\n", oa->o_valid);
+               CERROR("invalid o_valid %#llx\n", oa->o_valid);
                 return -EINVAL;
         }
 
@@ -151,13 +151,13 @@ static int echo_destroy(const struct lu_env *env, struct obd_export *exp,
 
         ENTRY;
         if (!obd) {
-                CERROR("invalid client cookie "LPX64"\n",
+               CERROR("invalid client cookie %#llx\n",
                        exp->exp_handle.h_cookie);
                 RETURN(-EINVAL);
         }
 
         if (!(oa->o_valid & OBD_MD_FLID)) {
-                CERROR("obdo missing FLID valid flag: "LPX64"\n", oa->o_valid);
+               CERROR("obdo missing FLID valid flag: %#llx\n", oa->o_valid);
                 RETURN(-EINVAL);
         }
 
@@ -178,13 +178,13 @@ static int echo_getattr(const struct lu_env *env, struct obd_export *exp,
 
        ENTRY;
        if (!obd) {
-               CERROR("invalid client cookie "LPX64"\n",
+               CERROR("invalid client cookie %#llx\n",
                       exp->exp_handle.h_cookie);
                RETURN(-EINVAL);
        }
 
        if (!(oa->o_valid & OBD_MD_FLID)) {
-               CERROR("obdo missing FLID valid flag: "LPX64"\n", oa->o_valid);
+               CERROR("obdo missing FLID valid flag: %#llx\n", oa->o_valid);
                RETURN(-EINVAL);
        }
 
@@ -202,13 +202,13 @@ static int echo_setattr(const struct lu_env *env, struct obd_export *exp,
 
        ENTRY;
        if (!obd) {
-               CERROR("invalid client cookie "LPX64"\n",
+               CERROR("invalid client cookie %#llx\n",
                       exp->exp_handle.h_cookie);
                RETURN(-EINVAL);
        }
 
        if (!(oa->o_valid & OBD_MD_FLID)) {
-               CERROR("obdo missing FLID valid flag: "LPX64"\n", oa->o_valid);
+               CERROR("obdo missing FLID valid flag: %#llx\n", oa->o_valid);
                RETURN(-EINVAL);
        }
 
@@ -318,7 +318,7 @@ static int echo_map_nb_to_lb(struct obdo *oa, struct obd_ioobj *obj,
                        }
                }
 
-               CDEBUG(D_PAGE, "$$$$ get page %p @ "LPU64" for %d\n",
+               CDEBUG(D_PAGE, "$$$$ get page %p @ %llu for %d\n",
                       res->lnb_page, res->lnb_file_offset, res->lnb_len);
 
                if (cmd & OBD_BRW_READ)
@@ -358,7 +358,7 @@ static int echo_finalize_lb(struct obdo *oa, struct obd_ioobj *obj,
                void       *addr;
 
                if (page == NULL) {
-                       CERROR("null page objid "LPU64":%p, buf %d/%d\n",
+                       CERROR("null page objid %llu:%p, buf %d/%d\n",
                               ostid_id(&obj->ioo_oid), page, i,
                               obj->ioo_bufcnt);
                        return -EFAULT;
@@ -366,7 +366,7 @@ static int echo_finalize_lb(struct obdo *oa, struct obd_ioobj *obj,
 
                addr = kmap(page);
 
-               CDEBUG(D_PAGE, "$$$$ use page %p, addr %p@"LPU64"\n",
+               CDEBUG(D_PAGE, "$$$$ use page %p, addr %p@%llu\n",
                       res->lnb_page, addr, res->lnb_file_offset);
 
                if (verify) {