aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
Diffstat (limited to 'block')
-rw-r--r--block/scsi_ioctl.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 045cabd3d4b4..f322b6a441d8 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -271,13 +271,6 @@ static int sg_io(struct file *file, request_queue_t *q,
271 271
272 rq->cmd_type = REQ_TYPE_BLOCK_PC; 272 rq->cmd_type = REQ_TYPE_BLOCK_PC;
273 273
274 /*
275 * bounce this after holding a reference to the original bio, it's
276 * needed for proper unmapping
277 */
278 if (rq->bio)
279 blk_queue_bounce(q, &rq->bio);
280
281 rq->timeout = jiffies_to_msecs(hdr->timeout); 274 rq->timeout = jiffies_to_msecs(hdr->timeout);
282 if (!rq->timeout) 275 if (!rq->timeout)
283 rq->timeout = q->sg_timeout; 276 rq->timeout = q->sg_timeout;