Attachment 315394 Details for Bug 460195 – Reworked version of scsi_host_lookup() patch

[patch] Reworked version of scsi_host_lookup() patch

scsi_host_lookup.patch (text/plain), 2.49 KB, created by James Smart on 2008-08-29 19:23:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Smart

Created: 2008-08-29 19:23:43 UTC

Size: 2.49 KB

patch

obsolete

>
>
> Signed-off-by: James Smart <james.smart@emulex.com>
>
> ---
>
> hosts.c                |    2 +-
> qla4xxx/ql4_os.c       |    2 +-
> scsi_proc.c            |    8 ++++----
> scsi_transport_iscsi.c |    2 +-
> 4 files changed, 7 insertions(+), 7 deletions(-)
>
>
>diff -upNr a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
>--- a/drivers/scsi/hosts.c	2008-06-10 11:09:01.000000000 -0400
>+++ b/drivers/scsi/hosts.c	2008-08-29 08:54:42.000000000 -0400
>@@ -429,7 +429,7 @@ struct Scsi_Host *scsi_host_lookup(unsig
> {
> 	struct class *class = &shost_class;
> 	struct class_device *cdev;
>-	struct Scsi_Host *shost = ERR_PTR(-ENXIO), *p;
>+	struct Scsi_Host *shost = NULL, *p;
> 
> 	down_read(&class->subsys.rwsem);
> 	list_for_each_entry(cdev, &class->children, node) {
>diff -upNr a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
>--- a/drivers/scsi/qla4xxx/ql4_os.c	2008-06-10 11:10:02.000000000 -0400
>+++ b/drivers/scsi/qla4xxx/ql4_os.c	2008-08-29 08:53:08.000000000 -0400
>@@ -228,7 +228,7 @@ static int qla4xxx_tgt_dscvr(enum iscsi_
> 	int ret = 0;
> 
> 	shost = scsi_host_lookup(host_no);
>-	if (IS_ERR(shost)) {
>+	if (!shost) {
> 		printk(KERN_ERR "Could not find host no %u\n", host_no);
> 		return -ENODEV;
> 	}
>diff -upNr a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
>--- a/drivers/scsi/scsi_proc.c	2008-06-10 11:09:42.000000000 -0400
>+++ b/drivers/scsi/scsi_proc.c	2008-08-29 08:56:04.000000000 -0400
>@@ -200,8 +200,8 @@ static int scsi_add_single_device(uint h
> 	int error = -ENXIO;
> 
> 	shost = scsi_host_lookup(host);
>-	if (IS_ERR(shost))
>-		return PTR_ERR(shost);
>+	if (!shost)
>+		return error;
> 
> 	if (shost->transportt->user_scan)
> 		error = shost->transportt->user_scan(shost, channel, id, lun);
>@@ -218,8 +218,8 @@ static int scsi_remove_single_device(uin
> 	int error = -ENXIO;
> 
> 	shost = scsi_host_lookup(host);
>-	if (IS_ERR(shost))
>-		return PTR_ERR(shost);
>+	if (!shost)
>+		return error;
> 	sdev = scsi_device_lookup(shost, channel, id, lun);
> 	if (sdev) {
> 		scsi_remove_device(sdev);
>diff -upNr a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
>--- a/drivers/scsi/scsi_transport_iscsi.c	2008-06-10 11:09:51.000000000 -0400
>+++ b/drivers/scsi/scsi_transport_iscsi.c	2008-08-29 08:55:00.000000000 -0400
>@@ -974,7 +974,7 @@ iscsi_set_host_param(struct iscsi_transp
> 		return -ENOSYS;
> 
> 	shost = scsi_host_lookup(ev->u.set_host_param.host_no);
>-	if (IS_ERR(shost)) {
>+	if (!shost) {
> 		printk(KERN_ERR "set_host_param could not find host no %u\n",
> 		       ev->u.set_host_param.host_no);
> 		return -ENODEV;

Actions: View | Diff

Attachments on bug 460195: 315023 | 315394 | 315395