Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  loop: mutex already unlocked in loop_clr_fd()
  cfq-iosched: don't let idling interfere with plugging
  block: remove unused REQ_UNPLUG
  cfq-iosched: kill two unused cfqq flags
  cfq-iosched: change dispatch logic to deal with single requests at the time
  mflash: initial support
  cciss: change to discover first memory BAR
  cciss: kernel scan thread for MSA2012
  cciss: fix residual count for block pc requests
  block: fix inconsistency in I/O stat accounting code
  block: elevator quiescing helpers

1 files changed, 23 insertions, 0 deletions

diff --git a/drivers/block/cciss_cmd.h b/drivers/block/cciss_cmd.h
index 24e22dea1a99..40b1b92dae7f 100644
--- a/drivers/block/cciss_cmd.h
+++ b/drivers/block/cciss_cmd.h
@@ -25,6 +25,29 @@
 #define CMD_TIMEOUT             0x000B
 #define CMD_UNABORTABLE         0x000C
 
+/* Unit Attentions ASC's as defined for the MSA2012sa */
+#define POWER_OR_RESET                  0x29
+#define STATE_CHANGED                   0x2a
+#define UNIT_ATTENTION_CLEARED          0x2f
+#define LUN_FAILED                      0x3e
+#define REPORT_LUNS_CHANGED             0x3f
+
+/* Unit Attentions ASCQ's as defined for the MSA2012sa */
+
+        /* These ASCQ's defined for ASC = POWER_OR_RESET */
+#define POWER_ON_RESET                  0x00
+#define POWER_ON_REBOOT                 0x01
+#define SCSI_BUS_RESET                  0x02
+#define MSA_TARGET_RESET                0x03
+#define CONTROLLER_FAILOVER             0x04
+#define TRANSCEIVER_SE                  0x05
+#define TRANSCEIVER_LVD                 0x06
+
+        /* These ASCQ's defined for ASC = STATE_CHANGED */
+#define RESERVATION_PREEMPTED           0x03
+#define ASYM_ACCESS_CHANGED             0x06
+#define LUN_CAPACITY_CHANGED            0x09
+
 //transfer direction
 #define XFER_NONE               0x00
 #define XFER_WRITE              0x01