From f3bd6746dfd237a636f329a82918a276042eef5f Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 23 Jul 2007 09:33:27 +0900
Subject: [PATCH] --- yaml --- r: 63123 b: refs/heads/master c:
 1079ddcb07e0c39b576cd60174ca00ed9545c163 h: refs/heads/master i:   63121:
 068c556269dd5e6216bc2e72ff0d8ca762c4ddb1   63119:
 f75c2a42a20868f8faabd73a5a28fd89c9acd1df v: v3

---
 [refs]            | 2 +-
 trunk/block/bsg.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 7652a5dbf3bf..abca4469cb04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 598443a2124618fc8fe5a8bae32c129666ac3eab
+refs/heads/master: 1079ddcb07e0c39b576cd60174ca00ed9545c163
diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c
index 8e4de53311e1..12c287b98625 100644
--- a/trunk/block/bsg.c
+++ b/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;