From e3f493dc73ec0e76e07abfffd121ddeae3da871d Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Mon, 23 Mar 2009 09:51:02 -0400
Subject: [PATCH] --- yaml --- r: 133473 b: refs/heads/master c:
 5c16034d73da2c1b663aa25dedadbc533b3d811c h: refs/heads/master i:   133471:
 041b02b1236d81de5a5d378f903fa975c3b899f2 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/usb/storage/scsiglue.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6f979b7da7bb..06d248b2b936 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 090b90118207e786d2990310d063fda5d52cce6e
+refs/heads/master: 5c16034d73da2c1b663aa25dedadbc533b3d811c
diff --git a/trunk/drivers/usb/storage/scsiglue.c b/trunk/drivers/usb/storage/scsiglue.c
index 727c506417cc..ed710bcdaab2 100644
--- a/trunk/drivers/usb/storage/scsiglue.c
+++ b/trunk/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.