Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Device-mapper Development (http://www.linux-archive.org/device-mapper-development/)
-   -   scsi_dh: code cleanup - remove the references to scsi_dev_info (http://www.linux-archive.org/device-mapper-development/593536-scsi_dh-code-cleanup-remove-references-scsi_dev_info.html)

"Moger, Babu" 11-01-2011 04:20 PM

scsi_dh: code cleanup - remove the references to scsi_dev_info
 
All the handlers have implemented the match function(look at patch 1, 2, 3).
We don't need to use scsi_dev_info any more for matching purposes.

Cleaning up the scsi_dh code.

FYI..
Match function was originally implemented by this

http://www.spinics.net/lists/linux-scsi/msg54284.html
or
http://git.kernel.org/?p=linux/kernel/git/jejb/scsi-misc-2.6.git;a=commit;h=6c3633d08acf514e2e89aa95d2346ce 9d64d719a

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

diff -uprN -X linux/Documentation/dontdiff linux//drivers/scsi/device_handler/scsi_dh.c linux-new/linux//drivers/scsi/device_handler/scsi_dh.c
--- linux//drivers/scsi/device_handler/scsi_dh.c 2011-10-31 13:47:37.000000000 -0500
+++ linux-new/linux//drivers/scsi/device_handler/scsi_dh.c 2011-10-31 13:45:46.000000000 -0500
@@ -27,7 +27,6 @@

static DEFINE_SPINLOCK(list_lock);
static LIST_HEAD(scsi_dh_list);
-static int scsi_dh_list_idx = 1;

static struct scsi_device_handler *get_device_handler(const char *name)
{
@@ -44,21 +43,6 @@ static struct scsi_device_handler *get_d
return found;
}

-static struct scsi_device_handler *get_device_handler_by_idx(int idx)
-{
- struct scsi_device_handler *tmp, *found = NULL;
-
- spin_lock(&list_lock);
- list_for_each_entry(tmp, &scsi_dh_list, list) {
- if (tmp->idx == idx) {
- found = tmp;
- break;
- }
- }
- spin_unlock(&list_lock);
- return found;
-}
-
/*
* device_handler_match_function - Match a device handler to a device
* @sdev - SCSI device to be tested
@@ -83,23 +67,6 @@ device_handler_match_function(struct scs
}

/*
- * device_handler_match_devlist - Match a device handler to a device
- * @sdev - SCSI device to be tested
- *
- * Tests @sdev against all device_handler registered in the devlist.
- * Returns the found device handler or NULL if not found.
- */
-static struct scsi_device_handler *
-device_handler_match_devlist(struct scsi_device *sdev)
-{
- int idx;
-
- idx = scsi_get_device_flags_keyed(sdev, sdev->vendor, sdev->model,
- SCSI_DEVINFO_DH);
- return get_device_handler_by_idx(idx);
-}
-
-/*
* device_handler_match - Attach a device handler to a device
* @scsi_dh - The device handler to match against or NULL
* @sdev - SCSI device to be tested against @scsi_dh
@@ -115,8 +82,6 @@ device_handler_match(struct scsi_device_
struct scsi_device_handler *found_dh;

found_dh = device_handler_match_function(sdev);
- if (!found_dh)
- found_dh = device_handler_match_devlist(sdev);

if (scsi_dh && found_dh != scsi_dh)
found_dh = NULL;
@@ -360,25 +325,14 @@ static int scsi_dh_notifier_remove(struc
*/
int scsi_register_device_handler(struct scsi_device_handler *scsi_dh)
{
- int i;

if (get_device_handler(scsi_dh->name))
return -EBUSY;

spin_lock(&list_lock);
- scsi_dh->idx = scsi_dh_list_idx++;
list_add(&scsi_dh->list, &scsi_dh_list);
spin_unlock(&list_lock);

- for (i = 0; scsi_dh->devlist && scsi_dh->devlist[i].vendor; i++) {
- scsi_dev_info_list_add_keyed(0,
- scsi_dh->devlist[i].vendor,
- scsi_dh->devlist[i].model,
- NULL,
- scsi_dh->idx,
- SCSI_DEVINFO_DH);
- }
-
bus_for_each_dev(&scsi_bus_type, NULL, scsi_dh, scsi_dh_notifier_add);
printk(KERN_INFO "%s: device handler registered
", scsi_dh->name);

@@ -395,7 +349,6 @@ EXPORT_SYMBOL_GPL(scsi_register_device_h
*/
int scsi_unregister_device_handler(struct scsi_device_handler *scsi_dh)
{
- int i;

if (!get_device_handler(scsi_dh->name))
return -ENODEV;
@@ -403,12 +356,6 @@ int scsi_unregister_device_handler(struc
bus_for_each_dev(&scsi_bus_type, NULL, scsi_dh,
scsi_dh_notifier_remove);

- for (i = 0; scsi_dh->devlist && scsi_dh->devlist[i].vendor; i++) {
- scsi_dev_info_list_del_keyed(scsi_dh->devlist[i].vendor,
- scsi_dh->devlist[i].model,
- SCSI_DEVINFO_DH);
- }
-
spin_lock(&list_lock);
list_del(&scsi_dh->list);
spin_unlock(&list_lock);
@@ -587,10 +534,6 @@ static int __init scsi_dh_init(void)
{
int r;

- r = scsi_dev_info_add_list(SCSI_DEVINFO_DH, "SCSI Device Handler");
- if (r)
- return r;
-
r = bus_register_notifier(&scsi_bus_type, &scsi_dh_nb);

if (!r)
@@ -605,7 +548,6 @@ static void __exit scsi_dh_exit(void)
bus_for_each_dev(&scsi_bus_type, NULL, NULL,
scsi_dh_sysfs_attr_remove);
bus_unregister_notifier(&scsi_bus_type, &scsi_dh_nb);
- scsi_dev_info_remove_list(SCSI_DEVINFO_DH);
}

module_init(scsi_dh_init);
diff -uprN -X linux/Documentation/dontdiff linux//include/scsi/scsi_device.h linux-new/linux//include/scsi/scsi_device.h
--- linux//include/scsi/scsi_device.h 2011-10-31 13:48:47.000000000 -0500
+++ linux-new/linux//include/scsi/scsi_device.h 2011-10-31 13:53:06.000000000 -0500
@@ -185,7 +185,6 @@ typedef void (*activate_complete)(void *
struct scsi_device_handler {
/* Used by the infrastructure */
struct list_head list; /* list of scsi_device_handlers */
- int idx;

/* Filled by the hardware handler */
struct module *module;



--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel


All times are GMT. The time now is 07:53 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.