diff options
| author | Christoph Hellwig <hch@lst.de> | 2005-09-06 08:03:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-09-06 18:25:16 -0400 |
| commit | 32993523dc59759ae6cb349e4d231d4cd2165329 (patch) | |
| tree | cefbe293f78922658232f44eafd17e29714bd9fe | |
| parent | 4869040512082b761de2d7c35975d01044f8bfea (diff) | |
[SCSI] fix SCSI_IOCTL_PROBE_HOST
This returns always false with new-style drivers right now. Make it
return always true instead, as a host must be present if we are able
to call the ioctl (without a host attached there would be no device
node to call on..)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| -rw-r--r-- | drivers/scsi/scsi_ioctl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c index f5bf5c07be91..946c31fa6466 100644 --- a/drivers/scsi/scsi_ioctl.c +++ b/drivers/scsi/scsi_ioctl.c | |||
| @@ -30,20 +30,20 @@ | |||
| 30 | 30 | ||
| 31 | #define MAX_BUF PAGE_SIZE | 31 | #define MAX_BUF PAGE_SIZE |
| 32 | 32 | ||
| 33 | /* | 33 | /** |
| 34 | * If we are told to probe a host, we will return 0 if the host is not | 34 | * ioctl_probe -- return host identification |
| 35 | * present, 1 if the host is present, and will return an identifying | 35 | * @host: host to identify |
| 36 | * string at *arg, if arg is non null, filling to the length stored at | 36 | * @buffer: userspace buffer for identification |
| 37 | * (int *) arg | 37 | * |
| 38 | * Return an identifying string at @buffer, if @buffer is non-NULL, filling | ||
| 39 | * to the length stored at * (int *) @buffer. | ||
| 38 | */ | 40 | */ |
| 39 | |||
| 40 | static int ioctl_probe(struct Scsi_Host *host, void __user *buffer) | 41 | static int ioctl_probe(struct Scsi_Host *host, void __user *buffer) |
| 41 | { | 42 | { |
| 42 | unsigned int len, slen; | 43 | unsigned int len, slen; |
| 43 | const char *string; | 44 | const char *string; |
| 44 | int temp = host->hostt->present; | ||
| 45 | 45 | ||
| 46 | if (temp && buffer) { | 46 | if (buffer) { |
| 47 | if (get_user(len, (unsigned int __user *) buffer)) | 47 | if (get_user(len, (unsigned int __user *) buffer)) |
| 48 | return -EFAULT; | 48 | return -EFAULT; |
| 49 | 49 | ||
| @@ -59,7 +59,7 @@ static int ioctl_probe(struct Scsi_Host *host, void __user *buffer) | |||
| 59 | return -EFAULT; | 59 | return -EFAULT; |
| 60 | } | 60 | } |
| 61 | } | 61 | } |
| 62 | return temp; | 62 | return 1; |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | /* | 65 | /* |
