From: Chandra Seetharaman <sekharan@us.ibm.com>
To: linux-scsi@vger.kernel.org
Cc: pjones@redhat.com, michaelc@cs.wisc.edu,
James.Bottomley@HansenPartnership.com, hare@suse.de,
Chandra Seetharaman <sekharan@us.ibm.com>
Subject: [PATCH 2/3] scsi_dh: Change scsi device handler modules to utilize modalias
Date: Mon, 27 Apr 2009 11:06:21 -0700 [thread overview]
Message-ID: <20090427180621.22758.25097.sendpatchset@chandra-ubuntu> (raw)
In-Reply-To: <20090427180609.22758.93035.sendpatchset@chandra-ubuntu>
From: Peter Jones <pjones@redhat.com>
This patch changes the scsi_dh files to make use of the modalias feature.
Signed-off-by: Peter Jones <pjones@redhat.com>
Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
---
drivers/scsi/device_handler/scsi_dh.c | 5 +++-
drivers/scsi/device_handler/scsi_dh_alua.c | 23 ++++++++-------
drivers/scsi/device_handler/scsi_dh_emc.c | 11 ++++---
drivers/scsi/device_handler/scsi_dh_hp_sw.c | 13 +++++----
drivers/scsi/device_handler/scsi_dh_rdac.c | 42 +++++++++++++++-------------
5 files changed, 51 insertions(+), 43 deletions(-)
Index: linux-2.6.29/drivers/scsi/device_handler/scsi_dh.c
===================================================================
--- linux-2.6.29.orig/drivers/scsi/device_handler/scsi_dh.c
+++ linux-2.6.29/drivers/scsi/device_handler/scsi_dh.c
@@ -75,7 +75,10 @@ static int scsi_dh_handler_lookup(struct
{
int i, found = 0;
- for(i = 0; scsi_dh->devlist[i].vendor; i++) {
+ for(i = 0; scsi_dh->devlist[i].vendor[0]; i++) {
+ if ((scsi_dh->devlist[i].type != TYPE_ANY) &&
+ (scsi_dh->devlist[i].type != sdev->type))
+ continue;
if (!strncmp(sdev->vendor, scsi_dh->devlist[i].vendor,
strlen(scsi_dh->devlist[i].vendor)) &&
!strncmp(sdev->model, scsi_dh->devlist[i].model,
Index: linux-2.6.29/drivers/scsi/device_handler/scsi_dh_alua.c
===================================================================
--- linux-2.6.29.orig/drivers/scsi/device_handler/scsi_dh_alua.c
+++ linux-2.6.29/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -691,19 +691,21 @@ static int alua_prep_fn(struct scsi_devi
}
static const struct scsi_dh_devlist alua_dev_list[] = {
- {"HP", "MSA VOLUME" },
- {"HP", "HSV101" },
- {"HP", "HSV111" },
- {"HP", "HSV200" },
- {"HP", "HSV210" },
- {"HP", "HSV300" },
- {"IBM", "2107900" },
- {"IBM", "2145" },
- {"Pillar", "Axiom" },
- {"Intel", "Multi-Flex"},
- {NULL, NULL}
+ {TYPE_ANY, "HP", "MSA VOLUME" },
+ {TYPE_ANY, "HP", "HSV101" },
+ {TYPE_ANY, "HP", "HSV111" },
+ {TYPE_ANY, "HP", "HSV200" },
+ {TYPE_ANY, "HP", "HSV210" },
+ {TYPE_ANY, "HP", "HSV300" },
+ {TYPE_ANY, "IBM", "2107900" },
+ {TYPE_ANY, "IBM", "2145" },
+ {TYPE_ANY, "Pillar", "Axiom" },
+ {TYPE_ANY, "Intel", "Multi-Flex"},
+ {0, "", ""},
};
+MODULE_DEVICE_TABLE(scsi_dh, alua_dev_list);
+
static int alua_bus_attach(struct scsi_device *sdev);
static void alua_bus_detach(struct scsi_device *sdev);
Index: linux-2.6.29/drivers/scsi/device_handler/scsi_dh_emc.c
===================================================================
--- linux-2.6.29.orig/drivers/scsi/device_handler/scsi_dh_emc.c
+++ linux-2.6.29/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -562,12 +562,13 @@ done:
return result;
}
-static const struct scsi_dh_devlist clariion_dev_list[] = {
- {"DGC", "RAID"},
- {"DGC", "DISK"},
- {"DGC", "VRAID"},
- {NULL, NULL},
+static const struct scsi_dh_device_id clariion_dev_list[] = {
+ {TYPE_ANY, "DGC", "RAID"},
+ {TYPE_ANY, "DGC", "DISK"},
+ {TYPE_ANY, "DGC", "VRAID"},
+ {0, "", ""},
};
+MODULE_DEVICE_TABLE(scsi_dh, clariion_dev_list);
static int clariion_bus_attach(struct scsi_device *sdev);
static void clariion_bus_detach(struct scsi_device *sdev);
Index: linux-2.6.29/drivers/scsi/device_handler/scsi_dh_hp_sw.c
===================================================================
--- linux-2.6.29.orig/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ linux-2.6.29/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -286,13 +286,14 @@ static int hp_sw_activate(struct scsi_de
return ret;
}
-static const struct scsi_dh_devlist hp_sw_dh_data_list[] = {
- {"COMPAQ", "MSA1000 VOLUME"},
- {"COMPAQ", "HSV110"},
- {"HP", "HSV100"},
- {"DEC", "HSG80"},
- {NULL, NULL},
+static const struct scsi_dh_device_id hp_sw_dh_data_list[] = {
+ {TYPE_ANY, "COMPAQ", "MSA1000 VOLUME"},
+ {TYPE_ANY, "COMPAQ", "HSV110"},
+ {TYPE_ANY, "HP", "HSV100"},
+ {TYPE_ANY, "DEC", "HSG80"},
+ {0, "", ""},
};
+MODULE_DEVICE_TABLE(scsi_dh, hp_sw_dh_data_list);
static int hp_sw_bus_attach(struct scsi_device *sdev);
static void hp_sw_bus_detach(struct scsi_device *sdev);
Index: linux-2.6.29/drivers/scsi/device_handler/scsi_dh_rdac.c
===================================================================
--- linux-2.6.29.orig/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ linux-2.6.29/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -608,28 +608,30 @@ static int rdac_check_sense(struct scsi_
return SCSI_RETURN_NOT_HANDLED;
}
-static const struct scsi_dh_devlist rdac_dev_list[] = {
- {"IBM", "1722"},
- {"IBM", "1724"},
- {"IBM", "1726"},
- {"IBM", "1742"},
- {"IBM", "1814"},
- {"IBM", "1815"},
- {"IBM", "1818"},
- {"IBM", "3526"},
- {"SGI", "TP9400"},
- {"SGI", "TP9500"},
- {"SGI", "IS"},
- {"STK", "OPENstorage D280"},
- {"SUN", "CSM200_R"},
- {"SUN", "LCSM100_F"},
- {"DELL", "MD3000"},
- {"DELL", "MD3000i"},
- {"LSI", "INF-01-00"},
- {"ENGENIO", "INF-01-00"},
- {NULL, NULL},
+static const struct scsi_dh_device_id rdac_dev_list[] = {
+ {TYPE_ANY, "IBM", "1722"},
+ {TYPE_ANY, "IBM", "1724"},
+ {TYPE_ANY, "IBM", "1726"},
+ {TYPE_ANY, "IBM", "1742"},
+ {TYPE_ANY, "IBM", "1814"},
+ {TYPE_ANY, "IBM", "1815"},
+ {TYPE_ANY, "IBM", "1818"},
+ {TYPE_ANY, "IBM", "3526"},
+ {TYPE_ANY, "SGI", "TP9400"},
+ {TYPE_ANY, "SGI", "TP9500"},
+ {TYPE_ANY, "SGI", "IS"},
+ {TYPE_ANY, "STK", "OPENstorage D280"},
+ {TYPE_ANY, "SUN", "CSM200_R"},
+ {TYPE_ANY, "SUN", "LCSM100_F"},
+ {TYPE_ANY, "DELL", "MD3000"},
+ {TYPE_ANY, "DELL", "MD3000i"},
+ {TYPE_ANY, "LSI", "INF-01-00"},
+ {TYPE_ANY, "ENGENIO", "INF-01-00"},
+ {0, "", ""},
};
+MODULE_DEVICE_TABLE(scsi_dh, rdac_dev_list);
+
static int rdac_bus_attach(struct scsi_device *sdev);
static void rdac_bus_detach(struct scsi_device *sdev);
next prev parent reply other threads:[~2009-04-27 18:05 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-27 18:06 [PATCH 0/3] scsi_dh: Make scsi device handler modules automatically inserted Chandra Seetharaman
2009-04-27 18:06 ` [PATCH 1/3] scsi_dh: Add modalias support for SCSI targets Chandra Seetharaman
2009-04-27 18:06 ` Chandra Seetharaman [this message]
2009-04-27 18:06 ` [PATCH 3/3] scsi_dh: Workaround a race condition in module insertion Chandra Seetharaman
2009-06-15 18:29 ` [PATCH 0/3] scsi_dh: Make scsi device handler modules automatically inserted Peter Jones
2009-06-15 23:14 ` Chandra Seetharaman
2009-06-18 22:48 ` James Bottomley
2009-06-19 18:58 ` Peter Jones
2009-06-26 13:56 ` Peter Jones
2009-07-07 17:12 ` James Bottomley
2009-07-07 17:51 ` Peter Jones
2009-07-07 18:14 ` James Bottomley
2009-07-07 19:36 ` Chandra Seetharaman
2009-07-08 15:53 ` [PATCH 0/3] scsi_dh: Make scsi device handler modulesautomatically inserted berthiaume_wayne
2009-07-08 18:28 ` Chandra Seetharaman
2009-07-08 15:58 ` [PATCH 0/3] scsi_dh: Make scsi device handler modules automatically inserted Christoph Hellwig
2009-07-08 18:21 ` Chandra Seetharaman
2009-07-08 18:33 ` Peter Jones
2009-07-08 18:40 ` Christoph Hellwig
2009-07-08 18:47 ` Peter Jones
2009-07-15 20:33 ` Chandra Seetharaman
2009-07-16 1:16 ` James Bottomley
2009-07-17 1:01 ` Chandra Seetharaman
2009-07-17 4:19 ` James Bottomley
2009-07-17 14:14 ` Peter Jones
2009-07-17 16:45 ` James Bottomley
2009-07-17 17:13 ` Peter Jones
2009-06-19 19:37 ` Chandra Seetharaman
2009-07-06 22:30 ` Chandra Seetharaman
-- strict thread matches above, loose matches on Subject: below --
2009-03-18 1:36 Chandra Seetharaman
2009-03-18 1:36 ` [PATCH 2/3] scsi_dh: Change scsi device handler modules to utilize modalias Chandra Seetharaman
2009-03-18 13:46 ` Konrad Rzeszutek
2009-03-18 15:43 ` Stefan Richter
2009-03-18 17:25 ` Chandra Seetharaman
2009-03-18 17:50 ` Stefan Richter
2009-03-18 18:18 ` Kay Sievers
2009-03-18 19:44 ` Stefan Richter
2009-03-18 18:50 ` Chandra Seetharaman
2009-03-18 19:46 ` Stefan Richter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090427180621.22758.25097.sendpatchset@chandra-ubuntu \
--to=sekharan@us.ibm.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=hare@suse.de \
--cc=linux-scsi@vger.kernel.org \
--cc=michaelc@cs.wisc.edu \
--cc=pjones@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).