Merge tag 'rpmsg-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg

[cascardo/linux.git] / drivers / scsi / device_handler / scsi_dh_alua.c

diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 6648ffb..68adb89 100644 (file)
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -712,6 +712,10 @@ static int alua_set_params(struct scsi_device *sdev, const char *params)
        return result;
 }
 
+static uint optimize_stpg;
+module_param(optimize_stpg, uint, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(optimize_stpg, "Allow use of a non-optimized path, rather than sending a STPG, when implicit TPGS is supported (0=No,1=Yes). Default is 0.");
+
 /*
  * alua_activate - activate a path
  * @sdev: device on the path to be activated
@@ -733,6 +737,9 @@ static int alua_activate(struct scsi_device *sdev,
        if (err != SCSI_DH_OK)
                goto out;
 
+       if (optimize_stpg)
+               h->flags |= ALUA_OPTIMIZE_STPG;
+
        if (h->tpgs & TPGS_MODE_EXPLICIT) {
                switch (h->state) {
                case TPGS_STATE_NONOPTIMIZED: