LU-6245 libcfs: remove byteorder.h

[fs/lustre-release.git] / lustre / utils / llog_reader.c

diff --git a/lustre/utils/llog_reader.c b/lustre/utils/llog_reader.c
index c5922c1..3167d92 100644 (file)
--- a/lustre/utils/llog_reader.c
+++ b/lustre/utils/llog_reader.c
@@ -262,7 +262,7 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
        }
 
        /* the llog header not countable here.*/
-       recs_num = le32_to_cpu((*llog)->llh_count) - 1;
+       recs_num = __le32_to_cpu((*llog)->llh_count) - 1;
 
        recs_buf = malloc(recs_num * sizeof(**recs_pr));
        if (recs_buf == NULL) {
@@ -274,7 +274,7 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
        }
        recs_pr = (struct llog_rec_hdr **)recs_buf;
 
-       ptr = file_buf + le32_to_cpu((*llog)->llh_hdr.lrh_len);
+       ptr = file_buf + __le32_to_cpu((*llog)->llh_hdr.lrh_len);
        i = 0;
 
        while (ptr < (file_buf + file_size)) {
@@ -290,7 +290,7 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
                }
 
                cur_rec = (struct llog_rec_hdr *)ptr;
-               idx = le32_to_cpu(cur_rec->lrh_index);
+               idx = __le32_to_cpu(cur_rec->lrh_index);
                recs_pr[i] = cur_rec;
                offset = (unsigned long)ptr - (unsigned long)file_buf;
                if (cur_rec->lrh_len == 0 ||
@@ -310,7 +310,7 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
                        i--;
                }
 
-               ptr += le32_to_cpu(cur_rec->lrh_len);
+               ptr += __le32_to_cpu(cur_rec->lrh_len);
                if ((ptr - file_buf) > file_size) {
                        printf("The log is corrupt (too big at %d)\n", i);
                        rc = -EINVAL;
@@ -345,24 +345,24 @@ void llog_unpack_buffer(int fd, struct llog_log_hdr *llog_buf,
 
 void print_llog_header(struct llog_log_hdr *llog_buf)
 {
-        time_t t;
+       time_t t;
 
-        printf("Header size : %u\n",
-               le32_to_cpu(llog_buf->llh_hdr.lrh_len));
+       printf("Header size : %u\n",
+              __le32_to_cpu(llog_buf->llh_hdr.lrh_len));
 
-        t = le64_to_cpu(llog_buf->llh_timestamp);
-        printf("Time : %s", ctime(&t));
+       t = __le64_to_cpu(llog_buf->llh_timestamp);
+       printf("Time : %s", ctime(&t));
 
-        printf("Number of records: %u\n",
-               le32_to_cpu(llog_buf->llh_count)-1);
+       printf("Number of records: %u\n",
+              __le32_to_cpu(llog_buf->llh_count)-1);
 
-        printf("Target uuid : %s \n",
-               (char *)(&llog_buf->llh_tgtuuid));
+       printf("Target uuid : %s\n",
+              (char *)(&llog_buf->llh_tgtuuid));
 
-        /* Add the other info you want to view here */
+       /* Add the other info you want to view here */
 
-        printf("-----------------------\n");
-        return;
+       printf("-----------------------\n");
+       return;
 }
 
 static void print_1_cfg(struct lustre_cfg *lcfg)
@@ -407,7 +407,7 @@ static void print_setup_cfg(struct lustre_cfg *lcfg)
 
 void print_lustre_cfg(struct lustre_cfg *lcfg, int *skip)
 {
-        enum lcfg_command_type cmd = le32_to_cpu(lcfg->lcfg_command);
+       enum lcfg_command_type cmd = __le32_to_cpu(lcfg->lcfg_command);
 
         if (*skip > 0)
                 printf("SKIP ");
@@ -625,10 +625,10 @@ static void print_hsm_action(struct llog_agent_req_rec *larr)
 void print_changelog_rec(struct llog_changelog_rec *rec)
 {
        printf("changelog record id:0x%x cr_flags:0x%x cr_type:%s(0x%x)\n",
-              le32_to_cpu(rec->cr_hdr.lrh_id),
-              le32_to_cpu(rec->cr.cr_flags),
-              changelog_type2str(le32_to_cpu(rec->cr.cr_type)),
-              le32_to_cpu(rec->cr.cr_type));
+              __le32_to_cpu(rec->cr_hdr.lrh_id),
+              __le32_to_cpu(rec->cr.cr_flags),
+              changelog_type2str(__le32_to_cpu(rec->cr.cr_type)),
+              __le32_to_cpu(rec->cr.cr_type));
 }
 
 static void print_records(struct llog_rec_hdr **recs,
@@ -638,10 +638,10 @@ static void print_records(struct llog_rec_hdr **recs,
        int i, skip = 0;
 
        for (i = 0; i < rec_number; i++) {
-               printf("#%.2d (%.3d)", le32_to_cpu(recs[i]->lrh_index),
-                      le32_to_cpu(recs[i]->lrh_len));
+               printf("#%.2d (%.3d)", __le32_to_cpu(recs[i]->lrh_index),
+                      __le32_to_cpu(recs[i]->lrh_len));
 
-               lopt = le32_to_cpu(recs[i]->lrh_type);
+               lopt = __le32_to_cpu(recs[i]->lrh_type);
 
                if (recs[i]->lrh_id == CANCELLED)
                        printf("NOT SET ");
@@ -668,7 +668,7 @@ static void print_records(struct llog_rec_hdr **recs,
                        break;
                case CHANGELOG_USER_REC:
                        printf("changelog_user record id:0x%x\n",
-                              le32_to_cpu(recs[i]->lrh_id));
+                              __le32_to_cpu(recs[i]->lrh_id));
                        break;
                default:
                        printf("unknown type %x\n", lopt);