Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / drivers / scsi / scsi_transport_fc.c

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 579760420d538d28f28d2f1e7246fc3d990e7fbf..2d1e68db9b3ffb5828482cdda3d797e3fa1d6677 100644 (file)
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -1744,6 +1744,15 @@ fc_host_statistic(fcp_output_requests);
 fc_host_statistic(fcp_control_requests);
 fc_host_statistic(fcp_input_megabytes);
 fc_host_statistic(fcp_output_megabytes);
+fc_host_statistic(fcp_packet_alloc_failures);
+fc_host_statistic(fcp_packet_aborts);
+fc_host_statistic(fcp_frame_alloc_failures);
+fc_host_statistic(fc_no_free_exch);
+fc_host_statistic(fc_no_free_exch_xid);
+fc_host_statistic(fc_xid_not_found);
+fc_host_statistic(fc_xid_busy);
+fc_host_statistic(fc_seq_not_found);
+fc_host_statistic(fc_non_bls_resp);
 
 static ssize_t
 fc_reset_statistics(struct device *dev, struct device_attribute *attr,
@@ -1784,6 +1793,15 @@ static struct attribute *fc_statistics_attrs[] = {
        &device_attr_host_fcp_control_requests.attr,
        &device_attr_host_fcp_input_megabytes.attr,
        &device_attr_host_fcp_output_megabytes.attr,
+       &device_attr_host_fcp_packet_alloc_failures.attr,
+       &device_attr_host_fcp_packet_aborts.attr,
+       &device_attr_host_fcp_frame_alloc_failures.attr,
+       &device_attr_host_fc_no_free_exch.attr,
+       &device_attr_host_fc_no_free_exch_xid.attr,
+       &device_attr_host_fc_xid_not_found.attr,
+       &device_attr_host_fc_xid_busy.attr,
+       &device_attr_host_fc_seq_not_found.attr,
+       &device_attr_host_fc_non_bls_resp.attr,
        &device_attr_host_reset_statistics.attr,
        NULL
 };
@@ -2477,11 +2495,9 @@ static void fc_terminate_rport_io(struct fc_rport *rport)
                i->f->terminate_rport_io(rport);
 
        /*
-        * must unblock to flush queued IO. The caller will have set
-        * the port_state or flags, so that fc_remote_port_chkready will
-        * fail IO.
+        * Must unblock to flush queued IO. scsi-ml will fail incoming reqs.
         */
-       scsi_target_unblock(&rport->dev);
+       scsi_target_unblock(&rport->dev, SDEV_TRANSPORT_OFFLINE);
 }
 
 /**
@@ -2812,8 +2828,8 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,
 
                                /* if target, initiate a scan */
                                if (rport->scsi_target_id != -1) {
-                                       scsi_target_unblock(&rport->dev);
-
+                                       scsi_target_unblock(&rport->dev,
+                                                           SDEV_RUNNING);
                                        spin_lock_irqsave(shost->host_lock,
                                                          flags);
                                        rport->flags |= FC_RPORT_SCAN_PENDING;
@@ -2882,7 +2898,7 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,
                        spin_unlock_irqrestore(shost->host_lock, flags);
 
                        if (ids->roles & FC_PORT_ROLE_FCP_TARGET) {
-                               scsi_target_unblock(&rport->dev);
+                               scsi_target_unblock(&rport->dev, SDEV_RUNNING);
 
                                /* initiate a scan of the target */
                                spin_lock_irqsave(shost->host_lock, flags);
@@ -3087,7 +3103,7 @@ fc_remote_port_rolechg(struct fc_rport  *rport, u32 roles)
                /* ensure any stgt delete functions are done */
                fc_flush_work(shost);
 
-               scsi_target_unblock(&rport->dev);
+               scsi_target_unblock(&rport->dev, SDEV_RUNNING);
                /* initiate a scan of the target */
                spin_lock_irqsave(shost->host_lock, flags);
                rport->flags |= FC_RPORT_SCAN_PENDING;
@@ -3131,7 +3147,7 @@ fc_timeout_deleted_rport(struct work_struct *work)
                        "blocked FC remote port time out: no longer"
                        " a FCP target, removing starget\n");
                spin_unlock_irqrestore(shost->host_lock, flags);
-               scsi_target_unblock(&rport->dev);
+               scsi_target_unblock(&rport->dev, SDEV_TRANSPORT_OFFLINE);
                fc_queue_work(shost, &rport->stgt_delete_work);
                return;
        }