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>

diff --git a/stat.h b/stat.h
index e9551381ce7b7fd10092c195033ff2b911f2aa75..c6353c70ae08146ae8e7760bbf0fbff4becaad9d 100644 (file)
--- 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;