From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751616AbaK1I5U (ORCPT ); Fri, 28 Nov 2014 03:57:20 -0500 Received: from cantor2.suse.de ([195.135.220.15]:51483 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751075AbaK1I5T (ORCPT ); Fri, 28 Nov 2014 03:57:19 -0500 Message-ID: <547838EB.1000506@suse.de> Date: Fri, 28 Nov 2014 09:57:15 +0100 From: Hannes Reinecke User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Ching Huang , hch@infradead.org, thenzl@redhat.com, jbottomley@parallels.com, dan.carpenter@oracle.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/1] arcmsr: Notify has sense data report References: <1417148444.16588.56.camel@Centos6.3-64> In-Reply-To: <1417148444.16588.56.camel@Centos6.3-64> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/28/2014 05:20 AM, Ching Huang wrote: > From: Ching Huang > > This patch is relative to http://git.infradead.org/users/hch/scsi-queue.git/tree/refs/heads/drivers-for-3.18:/drivers/scsi/arcmsr > > Setting command status with 'DRIVER_SENSE' except 'CHECK_CONDITION' if we have sense data. > > Signed-off-by: Ching Huang > --- > > diff -uprN a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h > --- a/drivers/scsi/arcmsr/arcmsr.h 2014-09-19 11:04:41.845100000 +0800 > +++ b/drivers/scsi/arcmsr/arcmsr.h 2014-11-28 10:54:30.000000000 +0800 > @@ -52,7 +52,7 @@ struct device_attribute; > #define ARCMSR_MAX_FREECCB_NUM 320 > #define ARCMSR_MAX_OUTSTANDING_CMD 255 > #endif > -#define ARCMSR_DRIVER_VERSION "v1.30.00.04-20140919" > +#define ARCMSR_DRIVER_VERSION "v1.30.00.05-20141128" > #define ARCMSR_SCSI_INITIATOR_ID 255 > #define ARCMSR_MAX_XFER_SECTORS 512 > #define ARCMSR_MAX_XFER_SECTORS_B 4096 > diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c > --- a/drivers/scsi/arcmsr/arcmsr_hba.c 2014-09-19 11:01:26.990090000 +0800 > +++ b/drivers/scsi/arcmsr/arcmsr_hba.c 2014-11-28 10:55:54.000000000 +0800 > @@ -989,7 +989,8 @@ static void arcmsr_report_sense_info(str > > struct scsi_cmnd *pcmd = ccb->pcmd; > struct SENSE_DATA *sensebuffer = (struct SENSE_DATA *)pcmd->sense_buffer; > - pcmd->result = DID_OK << 16; > + > + pcmd->result = (DID_OK << 16) | (CHECK_CONDITION << 1); > if (sensebuffer) { > int sense_data_length = > sizeof(struct SENSE_DATA) < SCSI_SENSE_BUFFERSIZE > @@ -998,6 +999,7 @@ static void arcmsr_report_sense_info(str > memcpy(sensebuffer, ccb->arcmsr_cdb.SenseData, sense_data_length); > sensebuffer->ErrorCode = SCSI_SENSE_CURRENT_ERRORS; > sensebuffer->Valid = 1; > + pcmd->result |= (DRIVER_SENSE << 24); > } > } > Hmm; we actually _always_ attach a sense buffer to the command. So the check for 'if (sensebuffer)' will always return true. I'd rather use a 'WARN_ON' here and get rid of the 'if' clause. Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage hare@suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: J. Hawn, J. Guild, F. Imendörffer, HRB 21284 (AG Nürnberg)