diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl> | 2004-08-27 21:19:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-27 21:19:40 -0700 |
| commit | 7722d1df688c926423e3323b0a865ac665d7e4fb (patch) | |
| tree | c3cff4b3579ce9dd93265684be48421797598189 /include/linux | |
| parent | b19d7ad9d1249de314344d8e75bca3e2e7d3d496 (diff) | |
[PATCH] ide: remove /proc/ide/hd?/settings:ide-scsi & HDIO_SET_IDE_SCSI ioctl
As noticed by Alan Cox:
"It doesn't work now so it clearly isnt being used 8). We hold the lock
because its a proc function and we then replace the proc functions in the
attach method -> deadlock. It is also incredibly hard to fix without a
major rewrite."
The same is true for HDIO_SET_IDE_SCSI ioctl.
Both were broken 18 months ago in 2.5.63 as a side-effect of locking fixes.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hdreg.h | 5 | ||||
| -rw-r--r-- | include/linux/ide.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h index 3d53bea7da87..54ad63b1d02c 100644 --- a/include/linux/hdreg.h +++ b/include/linux/hdreg.h @@ -449,9 +449,8 @@ enum { /* hd/ide ctl's that pass (arg) ptrs to user space are numbered 0x033n/0x033n */ /* 0x330 is reserved - used to be HDIO_GETGEO_BIG */ /* 0x331 is reserved - used to be HDIO_GETGEO_BIG_RAW */ - -#define HDIO_SET_IDE_SCSI 0x0338 -#define HDIO_SET_SCSI_IDE 0x0339 +/* 0x338 is reserved - used to be HDIO_SET_IDE_SCSI */ +/* 0x339 is reserved - used to be HDIO_SET_SCSI_IDE */ #define __NEW_HD_DRIVE_ID diff --git a/include/linux/ide.h b/include/linux/ide.h index 40ddd0d79e8f..936790012164 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -756,8 +756,8 @@ typedef struct ide_drive_s { * 2=48-bit doing 28-bit * 3=64-bit */ + unsigned scsi : 1; /* 0=default, 1=ide-scsi emulation */ - u8 scsi; /* 0=default, 1=skip current ide-subdriver for ide-scsi emulation */ u8 quirk_list; /* considered quirky, set for a specific host */ u8 suspend_reset; /* drive suspend mode flag, soft-reset recovers */ u8 init_speed; /* transfer rate set at boot */ |