---

yaml
---
r: 63123
b: refs/heads/master
c: 1079ddc
h: refs/heads/master
i:
  63121: 068c556
  63119: f75c2a4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 598443a2124618fc8fe5a8bae32c129666ac3eab
+refs/heads/master: 1079ddcb07e0c39b576cd60174ca00ed9545c163

trunk/block/bsg.c

@@ -9,13 +9,6 @@
  *  archive for more details.
  *
  */
-/*
- * TODO
- *	- Should this get merged, block/scsi_ioctl.c will be migrated into
- *	  this file. To keep maintenance down, it's easier to have them
- *	  seperated right now.
- *
- */
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/file.h>
@@ -92,7 +85,6 @@ struct bsg_command {
 	struct bio *bidi_bio;
 	int err;
 	struct sg_io_v4 hdr;
-	struct sg_io_v4 __user *uhdr;
 	char sense[SCSI_SENSE_BUFFERSIZE];
 };
 
@@ -620,7 +612,6 @@ static int __bsg_write(struct bsg_device *bd, const char __user *buf,
 			break;
 		}
 
-		bc->uhdr = (struct sg_io_v4 __user *) buf;
 		if (copy_from_user(&bc->hdr, buf, sizeof(bc->hdr))) {
 			ret = -EFAULT;
 			break;