From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753346AbbIPGtY (ORCPT ); Wed, 16 Sep 2015 02:49:24 -0400 Received: from mx2.suse.de ([195.135.220.15]:36154 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752565AbbIPGtV (ORCPT ); Wed, 16 Sep 2015 02:49:21 -0400 Subject: Re: [PATCH RESEND] csiostor:Fix error handling in the function csio_device_reset To: Nicholas Krause , JBottomley@odin.com References: <1442355274-22410-1-git-send-email-xerofoify@gmail.com> Cc: michaelc@cs.wisc.edu, davem@davemloft.net, anish@chelsio.com, martin.petersen@oracle.com, hariprasad@chelsio.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org From: Hannes Reinecke Message-ID: <55F910ED.7000001@suse.de> Date: Wed, 16 Sep 2015 08:49:17 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <1442355274-22410-1-git-send-email-xerofoify@gmail.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/16/2015 12:14 AM, Nicholas Krause wrote: > This fixes error handling in the function csio_device_reset to > check the return value of aftering the function csio_hw_reset > to check if it returned a error code and if so unlock the irq > spinlock for the hardware plus return the hardware error code > immediately. > > Signed-off-by: Nicholas Krause > --- > drivers/scsi/csiostor/csio_scsi.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c > index 2c4562d..faea4e7 100644 > --- a/drivers/scsi/csiostor/csio_scsi.c > +++ b/drivers/scsi/csiostor/csio_scsi.c > @@ -1378,6 +1378,7 @@ csio_device_reset(struct device *dev, > { > struct csio_lnode *ln = shost_priv(class_to_shost(dev)); > struct csio_hw *hw = csio_lnode_to_hw(ln); > + int ret; > > if (*buf != '1') > return -EINVAL; > @@ -1389,7 +1390,11 @@ csio_device_reset(struct device *dev, > csio_lnodes_block_request(hw); > > spin_lock_irq(&hw->lock); > - csio_hw_reset(hw); > + ret = csio_hw_reset(hw); > + if (ret) { > + spin_unlock_irq(&hw->lock); > + return ret; > + } > spin_unlock_irq(&hw->lock); > > /* Unblock upper IOs */ > No sure if that is correct; wouldn't the device stay blocked if csio_hw_reset() fails? Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage hare@suse.de +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)