IB/rdmvt: close send engine struct holes

pahole noted the wasted 4 bytes after s_lock and r_lock.

Move s_flags and r_psn to fill the holes.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/include/rdma/rdmavt_qp.h b/include/rdma/rdmavt_qp.h
index 933f14f92da6c41710431e1cef7b058571b747dd..5c307ed4d195b2ecd42db89c3e1c81e730a47a41 100644 (file)
--- a/include/rdma/rdmavt_qp.h
+++ b/include/rdma/rdmavt_qp.h
@@ -283,12 +283,12 @@ struct rvt_qp {
        struct rvt_sge_state s_rdma_read_sge;
 
        spinlock_t r_lock ____cacheline_aligned_in_smp;      /* used for APM */
+       u32 r_psn;              /* expected rcv packet sequence number */
        unsigned long r_aflags;
        u64 r_wr_id;            /* ID for current receive WQE */
        u32 r_ack_psn;          /* PSN for next ACK or atomic ACK */
        u32 r_len;              /* total length of r_sge */
        u32 r_rcv_len;          /* receive data len processed */
-       u32 r_psn;              /* expected rcv packet sequence number */
        u32 r_msn;              /* message sequence number */
 
        u8 r_state;             /* opcode of last packet received */
@@ -308,8 +308,8 @@ struct rvt_qp {
        u32 s_ssn;              /* SSN of tail entry */
 
        spinlock_t s_lock ____cacheline_aligned_in_smp;
-       struct rvt_sge_state *s_cur_sge;
        u32 s_flags;
+       struct rvt_sge_state *s_cur_sge;
        struct rvt_swqe *s_wqe;
        struct rvt_sge_state s_sge;     /* current send request data */
        struct rvt_mregion *s_rdma_mr;