summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Van Assche <bvanassche@acm.org>2019-08-14 13:10:09 -0700
committerJens Axboe <axboe@kernel.dk>2019-08-14 15:01:29 -0600
commita5b1c9da0faf31675cf5180c48d29af1870af85d (patch)
tree2192b0f3b3ee5559102b6906a07edfee62dccc7c
parent36833fb04b5f9a734e96a571dfb52fc54b5b95e7 (diff)
Refine packed annotations in stat.h
Instead of declaring the whole structure packed, only declare non-aligned members packed. This patch is an alternative way to fix the following gcc 9 compiler warnings: eta.c: In function 'calc_thread_status': eta.c:510:7: error: taking address of packed member of 'struct jobs_eta' may result in an unaligned pointer value [-Werror=address-of-packed-member] 510 | je->rate); | ~~^~~~~~ eta.c:522:66: error: taking address of packed member of 'struct jobs_eta' may result in an unaligned pointer value [-Werror=address-of-packed-member] 522 | calc_rate(unified_rw_rep, disp_time, io_bytes, disp_io_bytes, je->rate); | ~~^~~~~~ eta.c:523:64: error: taking address of packed member of 'struct jobs_eta' may result in an unaligned pointer value [-Werror=address-of-packed-member] 523 | calc_iops(unified_rw_rep, disp_time, io_iops, disp_io_iops, je->iops); | Signed-off-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--stat.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/stat.h b/stat.h
index e955138..c6353c7 100644
--- a/stat.h
+++ b/stat.h
@@ -260,10 +260,11 @@ struct jobs_eta {
uint64_t m_rate[DDIR_RWDIR_CNT], t_rate[DDIR_RWDIR_CNT];
uint64_t rate[DDIR_RWDIR_CNT];
- uint32_t m_iops[DDIR_RWDIR_CNT], t_iops[DDIR_RWDIR_CNT];
- uint32_t iops[DDIR_RWDIR_CNT];
- uint64_t elapsed_sec;
- uint64_t eta_sec;
+ uint32_t m_iops[DDIR_RWDIR_CNT] __attribute__((packed));
+ uint32_t t_iops[DDIR_RWDIR_CNT] __attribute__((packed));
+ uint32_t iops[DDIR_RWDIR_CNT] __attribute__((packed));
+ uint64_t elapsed_sec __attribute__((packed));
+ uint64_t eta_sec __attribute__((packed));
uint32_t is_pow2;
uint32_t unit_base;
@@ -276,7 +277,7 @@ struct jobs_eta {
*/
uint32_t nr_threads;
uint8_t run_str[];
-} __attribute__((packed));
+};
struct io_u_plat_entry {
struct flist_head list;