Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (119 commits)
  [SCSI] scsi_dh_rdac: Retry for NOT_READY check condition
  [SCSI] mpt2sas: make global symbols unique
  [SCSI] sd: Make revalidate less chatty
  [SCSI] sd: Try READ CAPACITY 16 first for SBC-2 devices
  [SCSI] sd: Refactor sd_read_capacity()
  [SCSI] mpt2sas v00.100.11.15
  [SCSI] mpt2sas: add MPT2SAS_MINOR(221) to miscdevice.h
  [SCSI] ch: Add scsi type modalias
  [SCSI] 3w-9xxx: add power management support
  [SCSI] bsg: add linux/types.h include to bsg.h
  [SCSI] cxgb3i: fix function descriptions
  [SCSI] libiscsi: fix possbile null ptr session command cleanup
  [SCSI] iscsi class: remove host no argument from session creation callout
  [SCSI] libiscsi: pass session failure a session struct
  [SCSI] iscsi lib: remove qdepth param from iscsi host allocation
  [SCSI] iscsi lib: have lib create work queue for transmitting IO
  [SCSI] iscsi class: fix lock dep warning on logout
  [SCSI] libiscsi: don't cap queue depth in iscsi modules
  [SCSI] iscsi_tcp: replace scsi_debug/tcp_debug logging with iscsi conn logging
  [SCSI] libiscsi_tcp: replace tcp_debug/scsi_debug logging with session/conn logging
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 899af2b45b1e..9a3b8e261c0a 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -112,9 +112,9 @@ static ZFCP_DEV_ATTR(_feat, failed, S_IWUSR | S_IRUGO,			       \
                      zfcp_sysfs_##_feat##_failed_show,                         \
                      zfcp_sysfs_##_feat##_failed_store);
 
-ZFCP_SYSFS_FAILED(zfcp_adapter, adapter, adapter, 44, 93);
-ZFCP_SYSFS_FAILED(zfcp_port, port, port->adapter, 45, 96);
-ZFCP_SYSFS_FAILED(zfcp_unit, unit, unit->port->adapter, 46, 97);
+ZFCP_SYSFS_FAILED(zfcp_adapter, adapter, adapter, "syafai1", "syafai2");
+ZFCP_SYSFS_FAILED(zfcp_port, port, port->adapter, "sypfai1", "sypfai2");
+ZFCP_SYSFS_FAILED(zfcp_unit, unit, unit->port->adapter, "syufai1", "syufai2");
 
 static ssize_t zfcp_sysfs_port_rescan_store(struct device *dev,
                                             struct device_attribute *attr,
@@ -168,7 +168,7 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,
                 goto out;
         }
 
-        zfcp_erp_port_shutdown(port, 0, 92, NULL);
+        zfcp_erp_port_shutdown(port, 0, "syprs_1", NULL);
         zfcp_erp_wait(adapter);
         zfcp_port_put(port);
         zfcp_port_dequeue(port);
@@ -222,7 +222,7 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,
 
         retval = 0;
 
-        zfcp_erp_unit_reopen(unit, 0, 94, NULL);
+        zfcp_erp_unit_reopen(unit, 0, "syuas_1", NULL);
         zfcp_erp_wait(unit->port->adapter);
         zfcp_unit_put(unit);
 out:
@@ -268,7 +268,7 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,
                 goto out;
         }
 
-        zfcp_erp_unit_shutdown(unit, 0, 95, NULL);
+        zfcp_erp_unit_shutdown(unit, 0, "syurs_1", NULL);
         zfcp_erp_wait(unit->port->adapter);
         zfcp_unit_put(unit);
         zfcp_unit_dequeue(unit);
@@ -318,10 +318,9 @@ zfcp_sysfs_unit_##_name##_latency_show(struct device *dev,		\
         struct zfcp_unit *unit = sdev->hostdata;                        \
         struct zfcp_latencies *lat = &unit->latencies;                  \
         struct zfcp_adapter *adapter = unit->port->adapter;             \
-        unsigned long flags;                                            \
         unsigned long long fsum, fmin, fmax, csum, cmin, cmax, cc;      \
                                                                         \
-        spin_lock_irqsave(&lat->lock, flags);                           \
+        spin_lock_bh(&lat->lock);                                       \
         fsum = lat->_name.fabric.sum * adapter->timer_ticks;            \
         fmin = lat->_name.fabric.min * adapter->timer_ticks;            \
         fmax = lat->_name.fabric.max * adapter->timer_ticks;            \
@@ -329,7 +328,7 @@ zfcp_sysfs_unit_##_name##_latency_show(struct device *dev,		\
         cmin = lat->_name.channel.min * adapter->timer_ticks;           \
         cmax = lat->_name.channel.max * adapter->timer_ticks;           \
         cc  = lat->_name.counter;                                       \
-        spin_unlock_irqrestore(&lat->lock, flags);                      \
+        spin_unlock_bh(&lat->lock);                                     \
                                                                         \
         do_div(fsum, 1000);                                             \
         do_div(fmin, 1000);                                             \
@@ -487,7 +486,8 @@ static ssize_t zfcp_sysfs_adapter_q_full_show(struct device *dev,
         struct zfcp_adapter *adapter =
                 (struct zfcp_adapter *) scsi_host->hostdata[0];
 
-        return sprintf(buf, "%d\n", atomic_read(&adapter->qdio_outb_full));
+        return sprintf(buf, "%d %llu\n", atomic_read(&adapter->qdio_outb_full),
+                       (unsigned long long)adapter->req_q_util);
 }
 static DEVICE_ATTR(queue_full, S_IRUGO, zfcp_sysfs_adapter_q_full_show, NULL);