X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fllog_reader.c;h=01e59de320d24a4c00cb46877975ac7ddda7fb68;hp=e99dc3515538a1428ce7370520ca71244d5c4a92;hb=3f3a241498be7e043df7e416da7fc8722a559498;hpb=94a16a027536100a9d0a279e1f384076a7a9b513

diff --git a/lustre/utils/llog_reader.c b/lustre/utils/llog_reader.c
index e99dc35..01e59de 100644
--- a/lustre/utils/llog_reader.c
+++ b/lustre/utils/llog_reader.c
@@ -185,7 +185,8 @@ int main(int argc, char **argv)
 	is_ext = is_fstype_ext(fd);
 	if (is_ext < 0) {
 		rc = is_ext;
-		printf("Unable to determine type of filesystem containing %s\n",
+		llapi_error(LLAPI_MSG_ERROR, -rc,
+			    "Unable to determine filesystem type for %s",
 		       argv[1]);
 		goto out_fd;
 	}
@@ -233,8 +234,7 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
 	file_size = st.st_size;
 	if (file_size < sizeof(**llog)) {
 		llapi_error(LLAPI_MSG_ERROR, rc,
-			    "File too small for llog header: "
-			    "need %zd, size %lld\n",
+			    "File too small for llog header: want=%zd got=%lld",
 			    sizeof(**llog), file_size);
 		rc = -EIO;
 		goto out;
@@ -278,7 +278,7 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
 	/* the llog header not countable here.*/
 	recs_num = count - 1;
 
-	recs_buf = malloc(recs_num * sizeof(**recs_pr));
+	recs_buf = calloc(recs_num, sizeof(**recs_pr));
 	if (recs_buf == NULL) {
 		rc = -ENOMEM;
 		llapi_error(LLAPI_MSG_ERROR, rc,
@@ -356,7 +356,6 @@ void llog_unpack_buffer(int fd, struct llog_log_hdr *llog_buf,
 		free(llog_buf);
 	if (recs_buf != NULL)
 		free(recs_buf);
-	return;
 }
 
 void print_llog_header(struct llog_log_hdr *llog_buf)
@@ -378,7 +377,6 @@ void print_llog_header(struct llog_log_hdr *llog_buf)
 	/* Add the other info you want to view here */
 
 	printf("-----------------------\n");
-	return;
 }
 
 static void print_1_cfg(struct lustre_cfg *lcfg)
@@ -393,7 +391,6 @@ static void print_1_cfg(struct lustre_cfg *lcfg)
         for (i = 0; i <  lcfg->lcfg_bufcount; i++)
                 printf("%d:%.*s  ", i, lcfg->lcfg_buflens[i],
                        (char*)lustre_cfg_buf(lcfg, i));
-        return;
 }
 
 static char *lustre_cfg_string(struct lustre_cfg *lcfg, __u32 index)
@@ -449,8 +446,6 @@ static void print_setup_cfg(struct lustre_cfg *lcfg)
                 printf("setup     ");
                 print_1_cfg(lcfg);
         }
-
-        return;
 }
 
 void print_lustre_cfg(struct lustre_cfg *lcfg, int *skip)
@@ -638,7 +633,6 @@ void print_lustre_cfg(struct lustre_cfg *lcfg, int *skip)
                 printf("unsupported cmd_code = %x\n",cmd);
         }
         printf("\n");
-        return;
 }
 
 static void print_hsm_action(struct llog_agent_req_rec *larr)
@@ -779,6 +773,12 @@ static void print_records(struct llog_rec_hdr **recs,
 	int i, skip = 0;
 
 	for (i = 0; i < rec_number; i++) {
+		if (recs[i] == NULL) {
+			llapi_printf(LLAPI_MSG_NORMAL,
+				     "uninitialized llog record at index %d\n",
+				     i);
+			break;
+		}
 		printf("#%.2d (%.3d)", __le32_to_cpu(recs[i]->lrh_index),
 		       __le32_to_cpu(recs[i]->lrh_len));