diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-04-28 08:36:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 11:44:37 -0400 |
| commit | f80a0ca6ad8f2800453e819dafa09a0ed9e56850 (patch) | |
| tree | bdbffa0e212888c31e11e89dc1194935f6825085 /fs | |
| parent | a36fed12a4d980eebb2e67b87ea30ad090238cff (diff) | |
pktcdvd: improve BKL and compat_ioctl.c usage
The pktcdvd driver uses proper locking and does not need the BKL in the
ioctl and llseek functions of the character device, so kill both.
Moving the compat_ioctl handling from common code into the driver itself
fixes build problems when CONFIG_BLOCK is disabled.
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/compat_ioctl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index c32a1b6a856b..641640dc7ae5 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -102,7 +102,6 @@ | |||
| 102 | #include <linux/nbd.h> | 102 | #include <linux/nbd.h> |
| 103 | #include <linux/random.h> | 103 | #include <linux/random.h> |
| 104 | #include <linux/filter.h> | 104 | #include <linux/filter.h> |
| 105 | #include <linux/pktcdvd.h> | ||
| 106 | 105 | ||
| 107 | #include <linux/hiddev.h> | 106 | #include <linux/hiddev.h> |
| 108 | 107 | ||
| @@ -1126,8 +1125,6 @@ COMPATIBLE_IOCTL(PPGETMODE) | |||
| 1126 | COMPATIBLE_IOCTL(PPGETPHASE) | 1125 | COMPATIBLE_IOCTL(PPGETPHASE) |
| 1127 | COMPATIBLE_IOCTL(PPGETFLAGS) | 1126 | COMPATIBLE_IOCTL(PPGETFLAGS) |
| 1128 | COMPATIBLE_IOCTL(PPSETFLAGS) | 1127 | COMPATIBLE_IOCTL(PPSETFLAGS) |
| 1129 | /* pktcdvd */ | ||
| 1130 | COMPATIBLE_IOCTL(PACKET_CTRL_CMD) | ||
| 1131 | /* Big A */ | 1128 | /* Big A */ |
| 1132 | /* sparc only */ | 1129 | /* sparc only */ |
| 1133 | /* Big Q for sound/OSS */ | 1130 | /* Big Q for sound/OSS */ |