1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
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
#
|
GitWeb