From aa897d09329d1c7a056c8fb07e7ab87ae677c734 Mon Sep 17 00:00:00 2001 From: "Martin K. Petersen" Date: Fri, 19 Sep 2008 18:47:20 -0400 Subject: [PATCH] --- yaml --- r: 115465 b: refs/heads/master c: be922f478f430f8fab4db952ffc20c86f23de397 h: refs/heads/master i: 115463: 27058486cb5c638f387389d2caa4f2a9bc849312 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sd.c | 7 ++----- trunk/drivers/scsi/sd_dif.c | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 70118cbfc4c6..126cecaf3b01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd623e79fb6bca7ab685bb1f7376476a81ce10bb +refs/heads/master: be922f478f430f8fab4db952ffc20c86f23de397 diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index fec034557c38..a494a2ec67d7 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/drivers/scsi/sd.c @@ -1253,14 +1253,12 @@ void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer) else type = ((buffer[12] >> 1) & 7) + 1; /* P_TYPE 0 = Type 1 */ + sdkp->protection_type = type; + switch (type) { case SD_DIF_TYPE0_PROTECTION: - sdkp->protection_type = 0; - break; - case SD_DIF_TYPE1_PROTECTION: case SD_DIF_TYPE3_PROTECTION: - sdkp->protection_type = type; break; case SD_DIF_TYPE2_PROTECTION: @@ -1278,7 +1276,6 @@ void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer) return; disable: - sdkp->protection_type = 0; sdkp->capacity = 0; } diff --git a/trunk/drivers/scsi/sd_dif.c b/trunk/drivers/scsi/sd_dif.c index 4d17f3d35aac..943fde7e7ffb 100644 --- a/trunk/drivers/scsi/sd_dif.c +++ b/trunk/drivers/scsi/sd_dif.c @@ -321,7 +321,6 @@ void sd_dif_config_host(struct scsi_disk *sdkp) if (scsi_host_dif_capable(sdp->host, type) == 0) { sd_printk(KERN_INFO, sdkp, "Type %d protection " \ "unsupported by HBA. Disabling DIF.\n", type); - sdkp->protection_type = 0; return; }