From f132f2b1522ac6f173a489c9f011c72ba6363af8 Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Fri, 6 Aug 2010 03:02:41 -0500 Subject: [PATCH] --- yaml --- r: 213307 b: refs/heads/master c: da99e307aa508fba6fbedc3699e7df64e284d2c5 h: refs/heads/master i: 213305: 074d11da3a60d5e7341a26a42df8dd453774e71a 213303: 7bdef82b4f5120eef1a298284ccf8f7702479bdf v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ibmvscsi/ibmvfc.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d80bd1747d04..f20c6aa3c2b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8196a934eea3810be6243b307b336136d63bbc48 +refs/heads/master: da99e307aa508fba6fbedc3699e7df64e284d2c5 diff --git a/trunk/drivers/scsi/ibmvscsi/ibmvfc.c b/trunk/drivers/scsi/ibmvscsi/ibmvfc.c index 9f75a6d519a2..a5dd9b4a0ae8 100644 --- a/trunk/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/trunk/drivers/scsi/ibmvscsi/ibmvfc.c @@ -1030,6 +1030,11 @@ static void ibmvfc_get_host_port_state(struct Scsi_Host *shost) spin_unlock_irqrestore(shost->host_lock, flags); } +static void ibmvfc_set_host_def_dev_loss_tmo(struct Scsi_Host *shost) +{ + fc_host_def_dev_loss_tmo(shost) = dev_loss_tmo; +} + /** * ibmvfc_set_rport_dev_loss_tmo - Set rport's device loss timeout * @rport: rport struct @@ -2788,7 +2793,6 @@ static int ibmvfc_target_alloc(struct scsi_target *starget) static int ibmvfc_slave_configure(struct scsi_device *sdev) { struct Scsi_Host *shost = sdev->host; - struct fc_rport *rport = starget_to_rport(sdev->sdev_target); unsigned long flags = 0; spin_lock_irqsave(shost->host_lock, flags); @@ -2800,8 +2804,6 @@ static int ibmvfc_slave_configure(struct scsi_device *sdev) scsi_activate_tcq(sdev, sdev->queue_depth); } else scsi_deactivate_tcq(sdev, sdev->queue_depth); - - rport->dev_loss_tmo = dev_loss_tmo; spin_unlock_irqrestore(shost->host_lock, flags); return 0; } @@ -4889,6 +4891,8 @@ static struct fc_function_template ibmvfc_transport_functions = { .get_host_speed = ibmvfc_get_host_speed, .show_host_speed = 1, + .get_host_def_dev_loss_tmo = ibmvfc_set_host_def_dev_loss_tmo, + .issue_fc_host_lip = ibmvfc_issue_fc_host_lip, .terminate_rport_io = ibmvfc_terminate_rport_io,