* [PATCH 05/15] libata: Add __ata_scsi_ioctl
@ 2006-03-17 23:04 Brian King
2006-03-22 1:54 ` Jeff Garzik
0 siblings, 1 reply; 4+ messages in thread
From: Brian King @ 2006-03-17 23:04 UTC (permalink / raw)
To: jgarzik; +Cc: linux-ide, linux-scsi, brking
In preparation for SAS, export a new interface that SAS LLDDs can
call to handle libata ioctls. The existing interface in insufficient
for this purpose since it assumes it owns the scsi_host struct.
Signed-off-by: Brian King <brking@us.ibm.com>
---
libata-dev-bjking1/drivers/scsi/libata-scsi.c | 36 ++++++++++++++++----------
libata-dev-bjking1/include/linux/libata.h | 1
2 files changed, 24 insertions(+), 13 deletions(-)
diff -puN drivers/scsi/libata-scsi.c~libata_scsi_ioctl drivers/scsi/libata-scsi.c
--- libata-dev/drivers/scsi/libata-scsi.c~libata_scsi_ioctl 2006-03-14 13:55:40.000000000 -0600
+++ libata-dev-bjking1/drivers/scsi/libata-scsi.c 2006-03-14 13:55:40.000000000 -0600
@@ -255,22 +255,10 @@ int ata_task_ioctl(struct scsi_device *s
return rc;
}
-int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
+int __ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
{
- struct ata_port *ap;
- struct ata_device *dev;
int val = -EINVAL, rc = -EINVAL;
- ap = (struct ata_port *) &scsidev->host->hostdata[0];
- if (!ap)
- goto out;
-
- dev = ata_scsi_find_dev(ap, scsidev);
- if (!dev) {
- rc = -ENODEV;
- goto out;
- }
-
switch (cmd) {
case ATA_IOC_GET_IO32:
val = 0;
@@ -299,6 +287,28 @@ int ata_scsi_ioctl(struct scsi_device *s
break;
}
+ return rc;
+}
+EXPORT_SYMBOL_GPL(__ata_scsi_ioctl);
+
+int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
+{
+ struct ata_port *ap;
+ struct ata_device *dev;
+ int rc = -EINVAL;
+
+ ap = (struct ata_port *) &scsidev->host->hostdata[0];
+ if (!ap)
+ goto out;
+
+ dev = ata_scsi_find_dev(ap, scsidev);
+ if (!dev) {
+ rc = -ENODEV;
+ goto out;
+ }
+
+ rc = __ata_scsi_ioctl(scsidev, cmd, arg);
+
out:
return rc;
}
diff -puN include/linux/libata.h~libata_scsi_ioctl include/linux/libata.h
--- libata-dev/include/linux/libata.h~libata_scsi_ioctl 2006-03-14 13:55:40.000000000 -0600
+++ libata-dev-bjking1/include/linux/libata.h 2006-03-14 13:55:40.000000000 -0600
@@ -507,6 +507,7 @@ extern int ata_device_add(const struct a
extern void ata_host_set_remove(struct ata_host_set *host_set);
extern int ata_scsi_detect(struct scsi_host_template *sht);
extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
+extern int __ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);
extern int ata_scsi_error(struct Scsi_Host *host);
_
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 05/15] libata: Add __ata_scsi_ioctl
2006-03-17 23:04 [PATCH 05/15] libata: Add __ata_scsi_ioctl Brian King
@ 2006-03-22 1:54 ` Jeff Garzik
2006-03-22 23:22 ` Brian King
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Garzik @ 2006-03-22 1:54 UTC (permalink / raw)
To: Brian King; +Cc: linux-ide, linux-scsi
Brian King wrote:
>
> -int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
> +int __ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
> {
> - struct ata_port *ap;
> - struct ata_device *dev;
> int val = -EINVAL, rc = -EINVAL;
>
> - ap = (struct ata_port *) &scsidev->host->hostdata[0];
> - if (!ap)
> - goto out;
> -
> - dev = ata_scsi_find_dev(ap, scsidev);
> - if (!dev) {
> - rc = -ENODEV;
> - goto out;
> - }
> -
> switch (cmd) {
Rather than create a new function, it looks like the above code can
simply be removed. I don't see anything that uses 'ap' or 'dev'.
Jeff
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 05/15] libata: Add __ata_scsi_ioctl
2006-03-22 1:54 ` Jeff Garzik
@ 2006-03-22 23:22 ` Brian King
2006-03-22 23:35 ` Jeff Garzik
0 siblings, 1 reply; 4+ messages in thread
From: Brian King @ 2006-03-22 23:22 UTC (permalink / raw)
To: Jeff Garzik; +Cc: linux-ide, linux-scsi
[-- Attachment #1: Type: text/plain, Size: 775 bytes --]
Jeff Garzik wrote:
> Brian King wrote:
>>
>> -int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
>> +int __ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
>> {
>> - struct ata_port *ap;
>> - struct ata_device *dev;
>> int val = -EINVAL, rc = -EINVAL;
>>
>> - ap = (struct ata_port *) &scsidev->host->hostdata[0];
>> - if (!ap)
>> - goto out;
>> -
>> - dev = ata_scsi_find_dev(ap, scsidev);
>> - if (!dev) {
>> - rc = -ENODEV;
>> - goto out;
>> - }
>> -
>> switch (cmd) {
>
>
> Rather than create a new function, it looks like the above code can
> simply be removed. I don't see anything that uses 'ap' or 'dev'.
>
Sounds good to me. Patch below.
--
Brian King
eServer Storage I/O
IBM Linux Technology Center
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: libata_scsi_ioctl.patch --]
[-- Type: text/x-patch; name="libata_scsi_ioctl.patch", Size: 1141 bytes --]
In preparation for SAS, kill some unnecessary code in ata_scsi_ioctl
to find the ATA port and device given the scsi_device. Neither local
is used in the function.
Signed-off-by: Brian King <brking@us.ibm.com>
---
libata-dev-bjking1/drivers/scsi/libata-scsi.c | 13 -------------
1 files changed, 13 deletions(-)
diff -puN drivers/scsi/libata-scsi.c~libata_scsi_ioctl drivers/scsi/libata-scsi.c
--- libata-dev/drivers/scsi/libata-scsi.c~libata_scsi_ioctl 2006-03-22 11:16:33.000000000 -0600
+++ libata-dev-bjking1/drivers/scsi/libata-scsi.c 2006-03-22 11:16:33.000000000 -0600
@@ -257,20 +257,8 @@ int ata_task_ioctl(struct scsi_device *s
int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
{
- struct ata_port *ap;
- struct ata_device *dev;
int val = -EINVAL, rc = -EINVAL;
- ap = (struct ata_port *) &scsidev->host->hostdata[0];
- if (!ap)
- goto out;
-
- dev = ata_scsi_find_dev(ap, scsidev);
- if (!dev) {
- rc = -ENODEV;
- goto out;
- }
-
switch (cmd) {
case ATA_IOC_GET_IO32:
val = 0;
@@ -299,7 +287,6 @@ int ata_scsi_ioctl(struct scsi_device *s
break;
}
-out:
return rc;
}
_
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 05/15] libata: Add __ata_scsi_ioctl
2006-03-22 23:22 ` Brian King
@ 2006-03-22 23:35 ` Jeff Garzik
0 siblings, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2006-03-22 23:35 UTC (permalink / raw)
To: brking; +Cc: linux-ide, linux-scsi
Brian King wrote:
> Jeff Garzik wrote:
>
>>Brian King wrote:
>>
>>>
>>>-int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
>>>+int __ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
>>> {
>>>- struct ata_port *ap;
>>>- struct ata_device *dev;
>>> int val = -EINVAL, rc = -EINVAL;
>>>
>>>- ap = (struct ata_port *) &scsidev->host->hostdata[0];
>>>- if (!ap)
>>>- goto out;
>>>-
>>>- dev = ata_scsi_find_dev(ap, scsidev);
>>>- if (!dev) {
>>>- rc = -ENODEV;
>>>- goto out;
>>>- }
>>>-
>>> switch (cmd) {
>>
>>
>>Rather than create a new function, it looks like the above code can
>>simply be removed. I don't see anything that uses 'ap' or 'dev'.
>>
>
>
> Sounds good to me. Patch below.
ACK
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-03-22 23:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-03-17 23:04 [PATCH 05/15] libata: Add __ata_scsi_ioctl Brian King
2006-03-22 1:54 ` Jeff Garzik
2006-03-22 23:22 ` Brian King
2006-03-22 23:35 ` Jeff Garzik
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).