Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ac6b91b8035bd269a1fd42474f907d107c074805
Commit: ac6b91b8035bd269a1fd42474f907d107c074805
Parent: 3d6392cfbd7dc11f23058e3493683afab4ac13a3
Author: FUJITA Tomonori <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 20 11:17:43 2006 +0100
Committer: Jens Axboe <[EMAIL PROTECTED]>
CommitDate: Mon Jul 16 08:52:44 2007 +0200
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 <[EMAIL PROTECTED]>
Signed-off-by: Jens Axboe <[EMAIL PROTECTED]>
---
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 88fd008..daded70 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;
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
