From 6257ab45e09d7df01c6a393c781a8ff16210f2ba Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Wed, 11 Nov 2009 16:34:36 -0600
Subject: [PATCH] --- yaml --- r: 173707 b: refs/heads/master c:
 1796e72291b2b6aafaec5954e666d0b5a95da935 h: refs/heads/master i:   173705:
 0a353ea9ae30aeb781390b24c601f300ccdc16d9   173703:
 6b5fe059223a585e84cba8765124ba68424d22e1 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/scsi/libiscsi.c | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ce53bd0f22f9..82a04c171eee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b20d038dff877566694181578c49c31616d622cd
+refs/heads/master: 1796e72291b2b6aafaec5954e666d0b5a95da935
diff --git a/trunk/drivers/scsi/libiscsi.c b/trunk/drivers/scsi/libiscsi.c
index 07ec997c5d4f..b7689f3d05f5 100644
--- a/trunk/drivers/scsi/libiscsi.c
+++ b/trunk/drivers/scsi/libiscsi.c
@@ -1739,10 +1739,19 @@ EXPORT_SYMBOL_GPL(iscsi_queuecommand);
 
 int iscsi_change_queue_depth(struct scsi_device *sdev, int depth, int reason)
 {
-	if (reason != SCSI_QDEPTH_DEFAULT)
+	switch (reason) {
+	case SCSI_QDEPTH_DEFAULT:
+		scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+		break;
+	case SCSI_QDEPTH_QFULL:
+		scsi_track_queue_full(sdev, depth);
+		break;
+	case SCSI_QDEPTH_RAMP_UP:
+		scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+		break;
+	default:
 		return -EOPNOTSUPP;
-
-	scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
+	}
 	return sdev->queue_depth;
 }
 EXPORT_SYMBOL_GPL(iscsi_change_queue_depth);