diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2007-07-22 20:33:27 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-23 17:50:16 -0400 |
commit | 1079ddcb07e0c39b576cd60174ca00ed9545c163 (patch) | |
tree | d66a69299db61d01201ea2c9861bfa38cf092936 /block | |
parent | 598443a2124618fc8fe5a8bae32c129666ac3eab (diff) |
[SCSI] bsg: remove unnecessary code and comments
- kill uhdr in bsg_command structure
- it's not necessary to put SG v4 stuff to block/scsi_ioctl.c
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/bsg.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/block/bsg.c b/block/bsg.c index 8e4de53311e1..12c287b98625 100644 --- a/block/bsg.c +++ b/block/bsg.c | |||
@@ -9,13 +9,6 @@ | |||
9 | * archive for more details. | 9 | * archive for more details. |
10 | * | 10 | * |
11 | */ | 11 | */ |
12 | /* | ||
13 | * TODO | ||
14 | * - Should this get merged, block/scsi_ioctl.c will be migrated into | ||
15 | * this file. To keep maintenance down, it's easier to have them | ||
16 | * seperated right now. | ||
17 | * | ||
18 | */ | ||
19 | #include <linux/module.h> | 12 | #include <linux/module.h> |
20 | #include <linux/init.h> | 13 | #include <linux/init.h> |
21 | #include <linux/file.h> | 14 | #include <linux/file.h> |
@@ -92,7 +85,6 @@ struct bsg_command { | |||
92 | struct bio *bidi_bio; | 85 | struct bio *bidi_bio; |
93 | int err; | 86 | int err; |
94 | struct sg_io_v4 hdr; | 87 | struct sg_io_v4 hdr; |
95 | struct sg_io_v4 __user *uhdr; | ||
96 | char sense[SCSI_SENSE_BUFFERSIZE]; | 88 | char sense[SCSI_SENSE_BUFFERSIZE]; |
97 | }; | 89 | }; |
98 | 90 | ||
@@ -620,7 +612,6 @@ static int __bsg_write(struct bsg_device *bd, const char __user *buf, | |||
620 | break; | 612 | break; |
621 | } | 613 | } |
622 | 614 | ||
623 | bc->uhdr = (struct sg_io_v4 __user *) buf; | ||
624 | if (copy_from_user(&bc->hdr, buf, sizeof(bc->hdr))) { | 615 | if (copy_from_user(&bc->hdr, buf, sizeof(bc->hdr))) { |
625 | ret = -EFAULT; | 616 | ret = -EFAULT; |
626 | break; | 617 | break; |