diff --git a/scst/include/scst.h b/scst/include/scst.h
index 412423004..68da53922 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -1943,7 +1943,6 @@ struct scst_tgt {
 	unsigned tgt_hw_dif_type3_supported:1;
 	unsigned tgt_hw_dif_ip_supported:1;
 	unsigned tgt_hw_dif_same_sg_layout_required:1;
-	const int *tgt_supported_dif_block_sizes;
 
 	/*
 	 * Maximum SG table size. Needed here, since different cards on the
@@ -1951,6 +1950,8 @@ struct scst_tgt {
 	 */
 	int sg_tablesize;
 
+	const int *tgt_supported_dif_block_sizes;
+
 	/* Used for storage of target driver private stuff */
 	void *tgt_priv;
 
@@ -1961,10 +1962,10 @@ struct scst_tgt {
 	 * They protected by tgt_lock, where necessary.
 	 */
 	bool retry_timer_active;
-	struct timer_list retry_timer;
 	int retry_cmds;
-	spinlock_t tgt_lock;
+	struct timer_list retry_timer;
 	struct list_head retry_cmd_list;
+	spinlock_t tgt_lock;
 
 	/* Used to wait until session finished to unregister */
 	wait_queue_head_t unreg_waitQ;