GIT d2dd950bda18fa0a0deeed96b13c3a00c04ce804 git+ssh://master.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git#for-akpm commit Author: Christoph Hellwig Date: Wed Nov 8 14:28:55 2006 +0100 [PATCH] blk_rq_unmap_user: remove superflous ulen argument blk_rq_unmap_user does not use it's ulen argument at all, and a patch I'm working on can't easily provide it. So let's just remove the argument. Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe commit 039f366ad78e05dfe8b0e793e4e33e8474c1b6a8 Author: Jens Axboe Date: Wed Nov 8 14:27:26 2006 +0100 [BLOCK] Cleanup unused variable passing - ->init_queue() does not need the elevator passed in - ->put_request() is a hot path and need not have the queue passed in - cfq_update_io_seektime() does not need cfqd passed in Signed-off-by: Jens Axboe block/ll_rw_blk.c | 8 ++++++++ block/scsi_ioctl.c | 4 ++++ drivers/cdrom/cdrom.c | 4 ++++ include/linux/blkdev.h | 5 +++++ 4 files changed, 21 insertions(+), 0 deletions(-) diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 785e61c..675507d 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -2516,13 +2516,21 @@ EXPORT_SYMBOL(blk_rq_map_user_iov); /** * blk_rq_unmap_user - unmap a request with user data +<<<<<<< HEAD/block/ll_rw_blk.c * @rq: rq to be unmapped +======= + * @bio: bio to be unmapped +>>>>>>> /block/ll_rw_blk.c * * Description: * Unmap a rq previously mapped by blk_rq_map_user(). * rq->bio must be set to the original head of the request. */ +<<<<<<< HEAD/block/ll_rw_blk.c int blk_rq_unmap_user(struct request *rq) +======= +int blk_rq_unmap_user(struct bio *bio) +>>>>>>> /block/ll_rw_blk.c { struct bio *bio, *mapped_bio; diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index b3e2107..76b5f8e 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -338,7 +338,11 @@ static int sg_io(struct file *file, requ hdr->sb_len_wr = len; } +<<<<<<< HEAD/block/scsi_ioctl.c if (blk_rq_unmap_user(rq)) +======= + if (blk_rq_unmap_user(bio)) +>>>>>>> /block/scsi_ioctl.c ret = -EFAULT; /* may not have succeeded, but output values written to control diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 2df5cf4..37ce6e2 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -2139,8 +2139,12 @@ static int cdrom_read_cdda_bpc(struct cd cdi->last_sense = s->sense_key; } +<<<<<<< HEAD/drivers/cdrom/cdrom.c rq->bio = bio; if (blk_rq_unmap_user(rq)) +======= + if (blk_rq_unmap_user(bio)) +>>>>>>> /drivers/cdrom/cdrom.c ret = -EFAULT; if (ret) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index e1c7286..63a03f0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -678,8 +678,13 @@ extern void __blk_stop_queue(request_que extern void blk_run_queue(request_queue_t *); extern void blk_start_queueing(request_queue_t *); extern void blk_queue_activity_fn(request_queue_t *, activity_fn *, void *); +<<<<<<< HEAD/include/linux/blkdev.h extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned long); extern int blk_rq_unmap_user(struct request *); +======= +extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned int); +extern int blk_rq_unmap_user(struct bio *); +>>>>>>> /include/linux/blkdev.h extern int blk_rq_map_kern(request_queue_t *, struct request *, void *, unsigned int, gfp_t); extern int blk_rq_map_user_iov(request_queue_t *, struct request *, struct sg_iovec *, int, unsigned int);