diff options
Diffstat (limited to 'openvz-sources/022.078/5217_diff-ms-scsi-adddev-22051214.patch')
| -rw-r--r-- | openvz-sources/022.078/5217_diff-ms-scsi-adddev-22051214.patch | 159 |
1 files changed, 0 insertions, 159 deletions
diff --git a/openvz-sources/022.078/5217_diff-ms-scsi-adddev-22051214.patch b/openvz-sources/022.078/5217_diff-ms-scsi-adddev-22051214.patch deleted file mode 100644 index 90d1304..0000000 --- a/openvz-sources/022.078/5217_diff-ms-scsi-adddev-22051214.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff -Naru a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c ---- a/drivers/scsi/scsi_scan.c 2005-12-14 08:12:08 -08:00 -+++ b/drivers/scsi/scsi_scan.c 2005-12-14 08:12:08 -08:00 -@@ -200,7 +200,7 @@ - * scsi_Device pointer, or NULL on failure. - **/ - static struct scsi_device *scsi_alloc_sdev(struct Scsi_Host *shost, -- uint channel, uint id, uint lun) -+ uint channel, uint id, uint lun, void *hostdata) - { - struct scsi_device *sdev, *device; - unsigned long flags; -@@ -224,6 +224,8 @@ - INIT_LIST_HEAD(&sdev->starved_entry); - spin_lock_init(&sdev->list_lock); - -+ /* usually NULL and set by ->slave_alloc instead */ -+ sdev->hostdata = hostdata; - - /* if the device needs this changing, it may do so in the - * slave_configure function */ -@@ -697,7 +699,7 @@ - **/ - static int scsi_probe_and_add_lun(struct Scsi_Host *host, - uint channel, uint id, uint lun, int *bflagsp, -- struct scsi_device **sdevp, int rescan) -+ struct scsi_device **sdevp, int rescan, void *hostdata) - { - struct scsi_device *sdev; - struct scsi_request *sreq; -@@ -726,7 +728,7 @@ - } - } - -- sdev = scsi_alloc_sdev(host, channel, id, lun); -+ sdev = scsi_alloc_sdev(host, channel, id, lun, hostdata); - if (!sdev) - goto out; - sreq = scsi_allocate_request(sdev, GFP_ATOMIC); -@@ -874,7 +876,7 @@ - */ - for (lun = 1; lun < max_dev_lun; ++lun) - if ((scsi_probe_and_add_lun(shost, channel, id, lun, -- NULL, NULL, rescan) != SCSI_SCAN_LUN_PRESENT) && -+ NULL, NULL, rescan, NULL) != SCSI_SCAN_LUN_PRESENT) && - !sparse_lun) - return; - } -@@ -1085,7 +1087,7 @@ - int res; - - res = scsi_probe_and_add_lun(sdev->host, sdev->channel, -- sdev->id, lun, NULL, NULL, rescan); -+ sdev->id, lun, NULL, NULL, rescan, NULL); - if (res == SCSI_SCAN_NO_RESPONSE) { - /* - * Got some results, but now none, abort. -@@ -1111,14 +1113,15 @@ - return 0; - } - --struct scsi_device *scsi_add_device(struct Scsi_Host *shost, -- uint channel, uint id, uint lun) -+struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel, -+ uint id, uint lun, void *hostdata) - { - struct scsi_device *sdev; - int res; - - down(&shost->scan_mutex); -- res = scsi_probe_and_add_lun(shost, channel, id, lun, NULL, &sdev, 1); -+ res = scsi_probe_and_add_lun(shost, channel, id, lun, NULL, -+ &sdev, 1, hostdata); - if (res != SCSI_SCAN_LUN_PRESENT) - sdev = ERR_PTR(-ENODEV); - up(&shost->scan_mutex); -@@ -1178,7 +1181,7 @@ - * Scan for a specific host/chan/id/lun. - */ - scsi_probe_and_add_lun(shost, channel, id, lun, NULL, NULL, -- rescan); -+ rescan, NULL); - return; - } - -@@ -1187,7 +1190,7 @@ - * would not configure LUN 0 until all LUNs are scanned. - */ - res = scsi_probe_and_add_lun(shost, channel, id, 0, &bflags, &sdev, -- rescan); -+ rescan, NULL); - if (res == SCSI_SCAN_LUN_PRESENT) { - if (scsi_report_lun_scan(sdev, bflags, rescan) != 0) - /* -@@ -1316,7 +1319,7 @@ - { - struct scsi_device *sdev; - -- sdev = scsi_alloc_sdev(shost, 0, shost->this_id, 0); -+ sdev = scsi_alloc_sdev(shost, 0, shost->this_id, 0, NULL); - if (sdev) { - sdev->borken = 0; - } -diff -Naru a/drivers/scsi/scsi_syms.c b/drivers/scsi/scsi_syms.c ---- a/drivers/scsi/scsi_syms.c 2005-12-14 08:12:08 -08:00 -+++ b/drivers/scsi/scsi_syms.c 2005-12-14 08:12:08 -08:00 -@@ -71,7 +71,7 @@ - - EXPORT_SYMBOL(scsi_io_completion); - --EXPORT_SYMBOL(scsi_add_device); -+EXPORT_SYMBOL(__scsi_add_device); - EXPORT_SYMBOL(scsi_remove_device); - EXPORT_SYMBOL(scsi_device_cancel); - -diff -Naru a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h ---- a/include/scsi/scsi_device.h 2005-12-14 08:12:08 -08:00 -+++ b/include/scsi/scsi_device.h 2005-12-14 08:12:08 -08:00 -@@ -129,8 +129,10 @@ - #define transport_class_to_sdev(class_dev) \ - container_of(class_dev, struct scsi_device, transport_classdev) - --extern struct scsi_device *scsi_add_device(struct Scsi_Host *, -- uint, uint, uint); -+extern struct scsi_device *__scsi_add_device(struct Scsi_Host *, -+ uint, uint, uint, void *hostdata); -+#define scsi_add_device(host, channel, target, lun) \ -+ __scsi_add_device(host, channel, target, lun, NULL) - extern void scsi_remove_device(struct scsi_device *); - extern int scsi_device_cancel(struct scsi_device *, int); - -# This is a BitKeeper generated diff -Nru style patch. -# -# ChangeSet -# 2004/08/24 14:32:36-04:00 akpm@osdl.org -# [PATCH] I2O: add functionality to scsi_add_device to preset -# -# From: Markus Lidel <Markus.Lidel@shadowconnect.com> -# -# - Add a new function __scsi_add_device, which has an additional parameter -# compared to scsi_add_device. This parameter is used to preset the hostdata -# pointer. -# -# Signed-off-by: Andrew Morton <akpm@osdl.org> -# Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> -# -# drivers/scsi/scsi_scan.c -# 2004/08/22 21:06:22-04:00 akpm@osdl.org +14 -11 -# I2O: add functionality to scsi_add_device to preset -# -# drivers/scsi/scsi_syms.c -# 2004/08/22 21:06:22-04:00 akpm@osdl.org +1 -1 -# I2O: add functionality to scsi_add_device to preset -# -# include/scsi/scsi_device.h -# 2004/08/22 21:06:22-04:00 akpm@osdl.org +4 -2 -# I2O: add functionality to scsi_add_device to preset -# - |