diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2016-05-31 09:18:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-11 09:30:01 -0700 |
| commit | 5fbbd1bce002d6764ded76bcbd86b3fa311ea85c (patch) | |
| tree | aa53d5e631cfeb446d0792a80f61f6a80370f2d0 | |
| parent | a7b341d255f5795759f2a7d2bac6f1e15652519b (diff) | |
| download | lwn-5fbbd1bce002d6764ded76bcbd86b3fa311ea85c.tar.gz lwn-5fbbd1bce002d6764ded76bcbd86b3fa311ea85c.zip | |
USB: uas: Fix slave queue_depth not being set
commit 593224ea77b1ca842f45cf76f4deeef44dfbacd1 upstream.
Commit 198de51dbc34 ("USB: uas: Limit qdepth at the scsi-host level")
removed the scsi_change_queue_depth() call from uas_slave_configure()
assuming that the slave would inherit the host's queue_depth, which
that commit sets to the same value.
This is incorrect, without the scsi_change_queue_depth() call the slave's
queue_depth defaults to 1, introducing a performance regression.
This commit restores the call, fixing the performance regression.
Fixes: 198de51dbc34 ("USB: uas: Limit qdepth at the scsi-host level")
Reported-by: Tom Yan <tom.ty89@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/storage/uas.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index 16bc679dc2fc..ecc7d4b1dfa3 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -835,6 +835,7 @@ static int uas_slave_configure(struct scsi_device *sdev) if (devinfo->flags & US_FL_BROKEN_FUA) sdev->broken_fua = 1; + scsi_change_queue_depth(sdev, devinfo->qdepth - 2); return 0; } |