LU-6245 libcfs: remove userland headers from libcfs.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 f4644c5..9dc3ef8 100644 (file)
--- a/lustre/utils/llog_reader.c
+++ b/lustre/utils/llog_reader.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,7 +40,9 @@
  * @{
  */
 
+#include <errno.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef HAVE_ENDIAN_H
@@ -50,7 +52,7 @@
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <linux/magic.h>
-
+#include <errno.h>
 #include <time.h>
 #include <lnet/nidstr.h>
 #include <lustre/lustre_idl.h>
@@ -208,8 +210,8 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
                     struct llog_rec_hdr ***recs,
                     int *recs_number)
 {
-       int rc = 0, recs_num, rd;
-       off_t file_size;
+       int rc = 0, recs_num, rd = 0;
+       long long file_size;
        struct stat st;
        char *file_buf = NULL, *recs_buf = NULL;
        struct llog_rec_hdr **recs_pr = NULL;
@@ -222,10 +224,14 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
                llapi_error(LLAPI_MSG_ERROR, rc, "Got file stat error.");
                goto out;
        }
+
        file_size = st.st_size;
-       if (file_size == 0) {
-               rc = -1;
-               llapi_error(LLAPI_MSG_ERROR, rc, "File is empty.");
+       if (file_size < sizeof(**llog)) {
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                           "File too small for llog header: "
+                           "need %zd, size %lld\n",
+                           sizeof(**llog), file_size);
+               rc = -EIO;
                goto out;
        }
 
@@ -237,20 +243,29 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
        }
        *llog = (struct llog_log_hdr *)file_buf;
 
-       rd = read(fd, file_buf, file_size);
+       do {
+               rc = read(fd, file_buf + rd, file_size - rd);
+               if (rc > 0)
+                       rd += rc;
+       } while (rc > 0 && rd < file_size);
+
        if (rd < file_size) {
-               rc = -EIO; /*FIXME*/
-               llapi_error(LLAPI_MSG_ERROR, rc, "Read file error.");
+               rc = rc < 0 ? -errno : -EIO;
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                           "Error reading llog header: need %zd, got %d",
+                           sizeof(**llog), rd);
                goto clear_file_buf;
        }
 
        /* the llog header not countable here.*/
        recs_num = le32_to_cpu((*llog)->llh_count) - 1;
 
-       recs_buf = malloc(recs_num * sizeof(struct llog_rec_hdr *));
+       recs_buf = malloc(recs_num * sizeof(**recs_pr));
        if (recs_buf == NULL) {
                rc = -ENOMEM;
-               llapi_error(LLAPI_MSG_ERROR, rc, "Memory Alloc for recs_buf.");
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                           "Error allocating %zd bytes for recs_buf",
+                           recs_num * sizeof(**recs_pr));
                goto clear_file_buf;
        }
        recs_pr = (struct llog_rec_hdr **)recs_buf;
@@ -263,8 +278,7 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
                int idx;
                unsigned long offset;
 
-               if (ptr + sizeof(struct llog_rec_hdr) >
-                   file_buf + file_size) {
+               if (ptr + sizeof(**recs_pr) > file_buf + file_size) {
                        rc = -EINVAL;
                        llapi_error(LLAPI_MSG_ERROR, rc,
                                    "The log is corrupt (too big at %d)", i);
@@ -496,22 +510,21 @@ void print_lustre_cfg(struct lustre_cfg *lcfg, int *skip)
                 char createtime[26], canceltime[26] = "";
                 time_t time_tmp;
 
-                if (marker->cm_flags & CM_SKIP) {
-                        if (marker->cm_flags & CM_START) {
-                                printf("SKIP START ");
-                                (*skip)++;
-                        } else {
-                                printf(     "END   ");
-                                *skip = 0;
-                        }
-                }
+               if (marker->cm_flags & CM_START &&
+                   marker->cm_flags & CM_SKIP) {
+                       printf("SKIP START ");
+                       (*skip)++;
+               } else if (marker->cm_flags & CM_END) {
+                       printf(     "END   ");
+                       *skip = 0;
+               }
 
-                if (marker->cm_flags & CM_EXCLUDE) {
-                        if (marker->cm_flags & CM_START)
-                                printf("EXCLUDE START ");
-                        else
-                                printf("EXCLUDE END   ");
-                }
+               if (marker->cm_flags & CM_EXCLUDE) {
+                       if (marker->cm_flags & CM_START)
+                               printf("EXCLUDE START ");
+                       else
+                               printf("EXCLUDE END   ");
+               }
 
                 /* Handle overflow of 32-bit time_t gracefully.
                  * The copy to time_tmp is needed in any case to