commit f2b9a67fee8dcbbe88bb0dbd87c058cd750961bf
author Jens Axboe <axboe@fb.com> Tue Jul 01 08:47:11 2014 -0600
committer Mohamad Ayyash <mkayyash@google.com> Fri Mar 06 17:57:09 2015 -0800
tree d3142ca7dc2dd17bb43a49cb370541909f8556dd
parent 6cac1b6dc872933f823c696360d7b1b21a39559e

client: fix missing pdu->log_offset endianness conversion

Make the iolog sample number uint64_t as well, so we have
the same size across 32 and 64-bit archs.

Signed-off-by: Jens Axboe <axboe@fb.com>

client.c

diff --git a/client.c b/client.c
index 4587824..6e7ed6d 100644
--- a/client.c
+++ b/client.c
@@ -1154,9 +1154,9 @@
 	/*
 	 * Get header first, it's not compressed
 	 */
-	nr_samples = le32_to_cpu(pdu->nr_samples);
+	nr_samples = le64_to_cpu(pdu->nr_samples);
 
-	total = nr_samples * __log_entry_sz(pdu->log_offset);
+	total = nr_samples * __log_entry_sz(le32_to_cpu(pdu->log_offset));
 	ret = malloc(total + sizeof(*pdu));
 	ret->nr_samples = nr_samples;
 

iolog.h

diff --git a/iolog.h b/iolog.h
index b387f48..eed9297 100644
--- a/iolog.h
+++ b/iolog.h
@@ -48,8 +48,8 @@
 	/*
 	 * Entries already logged
 	 */
-	unsigned long nr_samples;
-	unsigned long max_samples;
+	uint64_t nr_samples;
+	uint64_t max_samples;
 	void *log;
 
 	unsigned int log_type;