From 7358ed3b7c212f082a8d11fdc8ac16fcd1aee96e Mon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Sun, 4 Jan 2009 03:04:34 -0500
Subject: [PATCH] --- yaml --- r: 127903 b: refs/heads/master c:
 5db524bd469290212781e1cb0293b57a7a1c000a h: refs/heads/master i:   127901:
 54a63260698525b03f52f37064612f41116af8e7   127899:
 318f2d9420541be0fd64d2007b65d14c1aaeae5c   127895:
 0dfb620a2a78a8c669429b9ca65f5449fd0c2656   127887:
 b9b8c9519448dc9653faeff5ae0eccb41a0f173c   127871:
 262e8f9fff361d9e29807e986ffb226474ec123f v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/scsi/sd_dif.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 48fe6aac6b25..439490af6e98 100644
--- 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
index c9b41077fca1..184dff492797 100644
--- 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: