[RESEND][PATCH 3/4] scsi_dh_rdac: Adding the match function for rdac device handler

[RESEND][PATCH 3/4] scsi_dh_rdac: Adding the match function for rdac device handler

[Moger, Babu]

This patch introduces the match function for rdac device handler. Without this,
sometimes handler attach fails during the device_add. Included check for TPGS
bit before proceeding further. The match function was introduced by this patch
http://www.spinics.net/lists/linux-scsi/msg54284.html

Signed-off-by: Babu Moger <babu.moger@netapp.com>
---

--- linux-d211858/drivers/scsi/device_handler/scsi_dh_rdac.c.orig	2011-11-02 14:17:52.000000000 -0500
+++ linux-d211858/drivers/scsi/device_handler/scsi_dh_rdac.c	2011-11-02 15:27:51.000000000 -0500
@@ -819,6 +819,24 @@ static const struct scsi_dh_devlist rdac
 	{NULL, NULL},
 };
 
+static bool rdac_match(struct scsi_device *sdev)
+{
+	int i;
+
+	if (scsi_device_tpgs(sdev))
+		return false;
+
+	for (i = 0; rdac_dev_list[i].vendor; i++) {
+		if (!strncmp(sdev->vendor, rdac_dev_list[i].vendor,
+			strlen(rdac_dev_list[i].vendor)) &&
+		    !strncmp(sdev->model, rdac_dev_list[i].model,
+			strlen(rdac_dev_list[i].model))) {
+			return true;
+		}
+	}
+	return false;
+}
+
 static int rdac_bus_attach(struct scsi_device *sdev);
 static void rdac_bus_detach(struct scsi_device *sdev);
 
@@ -831,6 +849,7 @@ static struct scsi_device_handler rdac_d
 	.attach = rdac_bus_attach,
 	.detach = rdac_bus_detach,
 	.activate = rdac_activate,
+	.match = rdac_match,
 };
 
 static int rdac_bus_attach(struct scsi_device *sdev)

Re: [dm-devel] [RESEND][PATCH 3/4] scsi_dh_rdac: Adding the match function for rdac device handler

[Hannes Reinecke]

On 11/03/2011 04:51 PM, Moger, Babu wrote:
> This patch introduces the match function for rdac device handler. Without this,
> sometimes handler attach fails during the device_add. Included check for TPGS
> bit before proceeding further. The match function was introduced by this patch
> http://www.spinics.net/lists/linux-scsi/msg54284.html
>
> Signed-off-by: Babu Moger<babu.moger@netapp.com>

As the real patch of checking VPD pages is a bit more involved (eg 
we're taking the lock during ->match(), so invoking any I/O from 
here will get tricky), it's a sensible interim solution.

Acked-by: Hannes Reinecke <hare@suse.de>

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