diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 4d5ff8d6e..3cc5a5a93 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -392,11 +392,10 @@ static const struct scst_sdbops scst_scsi_op_table[] = {
 	 .info_len_off = 12, .info_len_len = 3,
 	 .get_cdb_info = get_cdb_info_len_3},
 	{.ops = 0x10, .devkey = " M V V          ",
-	 .info_op_name = "WRITE FILEMARKS",
-	 .info_data_direction = SCST_DATA_WRITE,
+	 .info_op_name = "WRITE FILEMARKS(6)",
+	 .info_data_direction = SCST_DATA_NONE,
 	 .info_op_flags = SCST_WRITE_MEDIUM,
-	 .info_len_off = 2, .info_len_len = 3,
-	 .get_cdb_info = get_cdb_info_len_3},
+	 .get_cdb_info = get_cdb_info_none},
 	{.ops = 0x10, .devkey = "  O O           ",
 	 .info_op_name = "SYNCHRONIZE BUFFER",
 	 .info_data_direction = SCST_DATA_NONE,
@@ -906,11 +905,10 @@ static const struct scst_sdbops scst_scsi_op_table[] = {
 
 	/* 16-bytes length CDB */
 	{.ops = 0x80, .devkey = " O              ",
-	 .info_op_name = "WRITE FILEMARKS",
-	 .info_data_direction = SCST_DATA_WRITE,
+	 .info_op_name = "WRITE FILEMARKS(16)",
+	 .info_data_direction = SCST_DATA_NONE,
 	 .info_op_flags = SCST_WRITE_MEDIUM,
-	 .info_len_off = 12, .info_len_len = 3,
-	 .get_cdb_info = get_cdb_info_len_3},
+	 .get_cdb_info = get_cdb_info_none},
 	{.ops = 0x81, .devkey = "O   OO O        ",
 	 .info_op_name = "REBUILD",
 	 .info_data_direction = SCST_DATA_WRITE,