aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFUJITA Tomonori2006-12-12 03:26:55 -0600
committerJens Axboe2006-12-12 03:26:55 -0600
commit335302618f47b43e1204d24a3edb65a3e5bc8c03 (patch)
treed10b3c138d90aa036cc02188c1ef40eba18ccbf0 /block/scsi_ioctl.c
parent77d172ce2719b5ad2dc0637452c8871d9cba344c (diff)
downloadkernel-common-335302618f47b43e1204d24a3edb65a3e5bc8c03.tar.gz
kernel-common-335302618f47b43e1204d24a3edb65a3e5bc8c03.tar.xz
kernel-common-335302618f47b43e1204d24a3edb65a3e5bc8c03.zip
[PATCH] remove unnecessary blk_queue_bounce in SG_IO
When I converted the original patch, I left unnecessary blk_queue_bounce in SG_IO. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/scsi_ioctl.c')
-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 045cabd3d4b..f322b6a441d 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;