Skip to contentSkip to conversation

blk_rq_unmap_user: remove superflous ulen argument

PATCH In review Christoph Hellwig 2 participants 2 messages Nov 7, 2006

Subsystems (3)
SCSI Block layer Uniform cdrom driver
lore
Share & tools
lore

Christoph Hellwig

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
block/ll_rw_blk.c +1 -2
Index: scsi-misc-2.6/block/ll_rw_blk.c
===================================================================
@@ -2466,12 +2466,11 @@
 /**
  * blk_rq_unmap_user - unmap a request with user data
  * @bio:	bio to be unmapped
- * @ulen:	length of user buffer
  *
  * Description:
  *    Unmap a bio previously mapped by blk_rq_map_user().
  */
-int blk_rq_unmap_user(struct bio *bio, unsigned int ulen)
+int blk_rq_unmap_user(struct bio *bio)
 {
 	int ret = 0;
block/scsi_ioctl.c +1 -1
Index: scsi-misc-2.6/block/scsi_ioctl.c
===================================================================
@@ -340,7 +340,7 @@
 			hdr->sb_len_wr = len;
 	}
 
-	if (blk_rq_unmap_user(bio, hdr->dxfer_len))
+	if (blk_rq_unmap_user(bio))
 		ret = -EFAULT;
 
 	/* may not have succeeded, but output values written to control
drivers/cdrom/cdrom.c +1 -1
Index: scsi-misc-2.6/drivers/cdrom/cdrom.c
===================================================================
@@ -2142,7 +2142,7 @@
 			cdi->last_sense = s->sense_key;
 		}
 
-		if (blk_rq_unmap_user(bio, len))
+		if (blk_rq_unmap_user(bio))
 			ret = -EFAULT;
 
 		if (ret)
include/linux/blkdev.h +1 -1
Index: scsi-misc-2.6/include/linux/blkdev.h
===================================================================
@@ -658,7 +658,7 @@
 extern void blk_start_queueing(request_queue_t *);
 extern void blk_queue_activity_fn(request_queue_t *, activity_fn *, void *);
 extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned int);
-extern int blk_rq_unmap_user(struct bio *, unsigned int);
+extern int blk_rq_unmap_user(struct bio *);
 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);
 extern int blk_execute_rq(request_queue_t *, struct gendisk *,