From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Henzl Subject: Re: [PATCH 1 04/25] hpsa: fix null device issues Date: Thu, 29 Oct 2015 15:06:41 +0100 Message-ID: <563227F1.3080909@redhat.com> References: <20151028215206.5323.84194.stgit@brunhilda> <20151028220453.5323.34762.stgit@brunhilda> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com ([209.132.183.28]:38351 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964869AbbJ2OGp (ORCPT ); Thu, 29 Oct 2015 10:06:45 -0400 In-Reply-To: <20151028220453.5323.34762.stgit@brunhilda> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: Don Brace , scott.teel@pmcs.com, Kevin.Barnett@pmcs.com, scott.benesh@pmcs.com, james.bottomley@parallels.com, hch@infradead.org, Justin.Lindley@pmcs.com, elliott@hpe.com Cc: linux-scsi@vger.kernel.org On 28.10.2015 23:04, Don Brace wrote: > Signed-off-by: Don Brace > --- > drivers/scsi/hpsa.c | 25 ++++++++++++++++++++----- > 1 file changed, 20 insertions(+), 5 deletions(-) > > diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c > index 6b6e9bb..3fe8a18 100644 > --- a/drivers/scsi/hpsa.c > +++ b/drivers/scsi/hpsa.c > @@ -1136,7 +1136,7 @@ static int hpsa_find_target_lun(struct ctlr_info *h, > return !found; > } > > -static inline void hpsa_show_dev_msg(const char *level, struct ctlr_info *h, > +static void hpsa_show_dev_msg(const char *level, struct ctlr_info *h, > struct hpsa_scsi_dev_t *dev, char *description) > { > if (dev == NULL) > @@ -1423,6 +1423,9 @@ static int hpsa_scsi_find_entry(struct hpsa_scsi_dev_t *needle, > #define DEVICE_CHANGED 1 > #define DEVICE_SAME 2 > #define DEVICE_UPDATED 3 > + if (needle == NULL) > + return DEVICE_NOT_FOUND; > + > for (i = 0; i < haystack_size; i++) { > if (haystack[i] == NULL) /* previously removed. */ > continue; > @@ -1574,6 +1577,9 @@ static void hpsa_figure_phys_disk_ptrs(struct ctlr_info *h, > total_disks_per_row; > int qdepth; > > + if (logical_drive == NULL) > + return; logical_drive - is used before this check - this function is called only from hpsa_update_log_drive_phys_drive_ptrs and there is a check (dev[i] == NULL) -> logical_drive can never be NULL here -tm > + > if (nraid_map_entries > RAID_MAP_MAX_ENTRIES) > nraid_map_entries = RAID_MAP_MAX_ENTRIES; > > @@ -1585,6 +1591,8 @@ static void hpsa_figure_phys_disk_ptrs(struct ctlr_info *h, > if (!logical_drive->offload_config) > continue; > for (j = 0; j < ndevices; j++) { > + if (dev[j] == NULL) > + continue; > if (dev[j]->devtype != TYPE_DISK) > continue; > if (is_logical_dev_addr_mode(dev[j]->scsi3addr)) > @@ -1628,6 +1636,8 @@ static void hpsa_update_log_drive_phys_drive_ptrs(struct ctlr_info *h, > int i; > > for (i = 0; i < ndevices; i++) { > + if (dev[i] == NULL) > + continue; > if (dev[i]->devtype != TYPE_DISK) > continue; > if (!is_logical_dev_addr_mode(dev[i]->scsi3addr)) > @@ -1743,8 +1753,11 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno, > /* Now that h->dev[]->phys_disk[] is coherent, we can enable > * any logical drives that need it enabled. > */ > - for (i = 0; i < h->ndevices; i++) > + for (i = 0; i < h->ndevices; i++) { > + if (h->dev[i] == NULL) > + continue; > h->dev[i]->offload_enabled = h->dev[i]->offload_to_be_enabled; > + } > > spin_unlock_irqrestore(&h->devlock, flags); > > @@ -1769,6 +1782,8 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno, > sh = h->scsi_host; > /* Notify scsi mid layer of any removed devices */ > for (i = 0; i < nremoved; i++) { > + if (removed[i] == NULL) > + continue; > if (removed[i]->expose_state & HPSA_SCSI_ADD) { > struct scsi_device *sdev = > scsi_device_lookup(sh, removed[i]->bus, > @@ -1792,18 +1807,18 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno, > > /* Notify scsi mid layer of any added devices */ > for (i = 0; i < nadded; i++) { > + if (added[i] == NULL) > + continue; > if (!(added[i]->expose_state & HPSA_SCSI_ADD)) > continue; > if (scsi_add_device(sh, added[i]->bus, > added[i]->target, added[i]->lun) == 0) > continue; > - hpsa_show_dev_msg(KERN_WARNING, h, added[i], > - "addition failed, device not added."); > + dev_warn(&h->pdev->dev, "addition failed, device not added."); > /* now we have to remove it from h->dev, > * since it didn't get added to scsi mid layer > */ > fixup_botched_add(h, added[i]); > - added[i] = NULL; > } > > free_and_out: > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html