Re: [PATCH 1 04/25] hpsa: fix null device issues

[Hannes Reinecke <hare@suse.de>]

On 10/28/2015 11:04 PM, Don Brace wrote:
> Signed-off-by: Don Brace <don.brace@pmcs.com>
> ---
>  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)
This is not a null device check; you modified the function.
Please put it into a separate function.

Or make a patch 'cleanup' or something.

> @@ -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;
> +
>  	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:
> 
Again, modifying the logging message is not a null device check.
Please move it into another patch.

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)
--
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