diff --git a/[refs] b/[refs] index dcfd95d47886..19bc597422f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77d172ce2719b5ad2dc0637452c8871d9cba344c +refs/heads/master: 335302618f47b43e1204d24a3edb65a3e5bc8c03 diff --git a/trunk/block/scsi_ioctl.c b/trunk/block/scsi_ioctl.c index 045cabd3d4b4..f322b6a441d8 100644 --- a/trunk/block/scsi_ioctl.c +++ b/trunk/block/scsi_ioctl.c @@ -271,13 +271,6 @@ static int sg_io(struct file *file, request_queue_t *q, rq->cmd_type = REQ_TYPE_BLOCK_PC; - /* - * bounce this after holding a reference to the original bio, it's - * needed for proper unmapping - */ - if (rq->bio) - blk_queue_bounce(q, &rq->bio); - rq->timeout = jiffies_to_msecs(hdr->timeout); if (!rq->timeout) rq->timeout = q->sg_timeout;