1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 727c506417cc..4ca3b5860643 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -135,6 +135,12 @@ static int slave_configure(struct scsi_device *sdev)
                 if (sdev->request_queue->max_sectors > max_sectors)
                         blk_queue_max_sectors(sdev->request_queue,
                                               max_sectors);
+        } else if (sdev->type == TYPE_TAPE) {
+                /* Tapes need much higher max_sector limits, so just
+                 * raise it to the maximum possible (4 GB / 512) and
+                 * let the queue segment size sort out the real limit.
+                 */
+                blk_queue_max_sectors(sdev->request_queue, 0x7FFFFF);
         }
 
         /* Some USB host controllers can't do DMA; they have to use PIO.
@@ -563,4 +569,4 @@ unsigned char usb_stor_sense_invalidCDB[18] = {
         [7]     = 0x0a,                     /* additional length */
         [12]    = 0x24                      /* Invalid Field in CDB */
 };
-
+EXPORT_SYMBOL_GPL(usb_stor_sense_invalidCDB);