---

yaml --- r: 127903 b: refs/heads/master c: 5db524b h: refs/heads/master i: 127901: 54a6326 127899: 318f2d9 127895: 0dfb620 127887: b9b8c95 127871: 262e8f9 v: v3
git-mirror · Jan 5, 2009 · 7358ed3 · 7358ed3
1 parent 22b26ab
commit 7358ed3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: becce74b8231f8b5e51165e797f6c950d1dbcf67
+refs/heads/master: 5db524bd469290212781e1cb0293b57a7a1c000a
diff --git a/trunk/drivers/scsi/sd_dif.c b/trunk/drivers/scsi/sd_dif.c
@@ -374,7 +374,10 @@ void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix, unsig
 	else
 		csum_convert = 0;
 
+	BUG_ON(dif && (scmd->cmnd[0] == READ_6 || scmd->cmnd[0] == WRITE_6));
+
 	switch (scmd->cmnd[0]) {
+	case READ_6:
 	case READ_10:
 	case READ_12:
 	case READ_16:
@@ -390,6 +393,7 @@ void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix, unsig
 
 		break;
 
+	case WRITE_6:
 	case WRITE_10:
 	case WRITE_12:
 	case WRITE_16: