Merge branch 'next' (accumulated 3.16 merge window patches) into master

[karo-tx-linux.git] / drivers / target / target_core_alua.c

diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index 0b79b852f4b2d9751d7a0f7224b63c13de39bf6a..fbc5ebb5f7613c4f7a70c5c0adfbadf27bd4cf30 100644 (file)
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -576,7 +576,16 @@ static inline int core_alua_state_standby(
        case REPORT_LUNS:
        case RECEIVE_DIAGNOSTIC:
        case SEND_DIAGNOSTIC:
+       case READ_CAPACITY:
                return 0;
+       case SERVICE_ACTION_IN:
+               switch (cdb[1] & 0x1f) {
+               case SAI_READ_CAPACITY_16:
+                       return 0;
+               default:
+                       set_ascq(cmd, ASCQ_04H_ALUA_TG_PT_STANDBY);
+                       return 1;
+               }
        case MAINTENANCE_IN:
                switch (cdb[1] & 0x1f) {
                case MI_REPORT_TARGET_PGS: