diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 88073848e..38b0be2c6 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -4605,14 +4605,14 @@ struct scst_write_same_priv {
 
 	struct mutex ws_mutex;
 
-	int ws_cur_lba; /* in blocks */
+	int64_t ws_cur_lba; /* in blocks */
 	int ws_left_to_send; /* in blocks */
 
 	int ws_max_each;/* in blocks */
 	int ws_cur_in_flight;
 
-	struct scatterlist *ws_sg;
 	int ws_sg_cnt;
+	struct scatterlist *ws_sg;
 };
 
 /* ws_mutex suppose to be locked */