diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 23:02:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 23:02:18 -0400 |
| commit | 35d91f75c2c9548e606e813413f03c5cc35da969 (patch) | |
| tree | 2a1a3f32320409303247a72ead35107c271abb17 /drivers/block | |
| parent | 9401c705f2a6a7e5df102f6443dba395c3c5e5a8 (diff) | |
| parent | 70c83e110541e894fa16aee0f57bcf4207b33e7b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/scsi_ioctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c index abb2df249fd3..856c2278e9d0 100644 --- a/drivers/block/scsi_ioctl.c +++ b/drivers/block/scsi_ioctl.c | |||
| @@ -123,6 +123,7 @@ static int verify_command(struct file *file, unsigned char *cmd) | |||
| 123 | safe_for_read(READ_12), | 123 | safe_for_read(READ_12), |
| 124 | safe_for_read(READ_16), | 124 | safe_for_read(READ_16), |
| 125 | safe_for_read(READ_BUFFER), | 125 | safe_for_read(READ_BUFFER), |
| 126 | safe_for_read(READ_DEFECT_DATA), | ||
| 126 | safe_for_read(READ_LONG), | 127 | safe_for_read(READ_LONG), |
| 127 | safe_for_read(INQUIRY), | 128 | safe_for_read(INQUIRY), |
| 128 | safe_for_read(MODE_SENSE), | 129 | safe_for_read(MODE_SENSE), |