diff options
| author | FUJITA Tomonori <tomof@acm.org> | 2006-12-20 11:17:43 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-07-16 08:52:44 +0200 |
| commit | ac6b91b8035bd269a1fd42474f907d107c074805 (patch) | |
| tree | 275d86f1bd2ee22be7355f3cd4e0b9e3472b99d8 /block/scsi_ioctl.c | |
| parent | 3d6392cfbd7dc11f23058e3493683afab4ac13a3 (diff) | |
| download | linux-ac6b91b8035bd269a1fd42474f907d107c074805.tar.bz2 | |
block: changes for blk_rq_unmap_user new API
This converts block/scsi_ioctl.c use blk_rq_unmap_user new
API. blk_unmap_sghdr_rq is too simple and it might be better to remove
it.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/scsi_ioctl.c')
| -rw-r--r-- | block/scsi_ioctl.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 88fd008d38bd..daded70ffbb1 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -245,17 +245,7 @@ EXPORT_SYMBOL_GPL(blk_fill_sghdr_rq); */ int blk_unmap_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr) { - struct bio *bio = rq->bio; - - /* - * also releases request - */ - if (!hdr->iovec_count) - return blk_rq_unmap_user(bio, hdr->dxfer_len); - - rq_for_each_bio(bio, rq) - bio_unmap_user(bio); - + blk_rq_unmap_user(rq->bio); blk_put_request(rq); return 0; } @@ -335,7 +325,6 @@ static int sg_io(struct file *file, request_queue_t *q, has_write_perm = file->f_mode & FMODE_WRITE; if (blk_fill_sghdr_rq(q, rq, hdr, has_write_perm)) { - blk_rq_unmap_user(bio, hdr->dxfer_len); blk_put_request(rq); return -EFAULT; } |