diff options
author | Alasdair G Kergon <agk@redhat.com> | 2006-10-03 04:15:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:13 -0400 |
commit | 7006f6eca874cd44d37ccb8cfeb8bed04e3bff22 (patch) | |
tree | 2e0827157e770e62493dea144e5d9ef73091e554 /block/ioctl.c | |
parent | 9af4aa30b713a58e5952045f52c41a6e3baa2fdc (diff) |
[PATCH] dm: export blkdev_driver_ioctl
Export blkdev_driver_ioctl for device-mapper.
If we get as far as the device-mapper ioctl handler, we know the ioctl is not
a standard block layer BLK* one, so we don't need to check for them a second
time and can call blkdev_driver_ioctl() directly.
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'block/ioctl.c')
-rw-r--r-- | block/ioctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index 309760b7e37f..58aab630dfc1 100644 --- a/block/ioctl.c +++ b/block/ioctl.c | |||
@@ -199,8 +199,8 @@ static int blkdev_locked_ioctl(struct file *file, struct block_device *bdev, | |||
199 | return -ENOIOCTLCMD; | 199 | return -ENOIOCTLCMD; |
200 | } | 200 | } |
201 | 201 | ||
202 | static int blkdev_driver_ioctl(struct inode *inode, struct file *file, | 202 | int blkdev_driver_ioctl(struct inode *inode, struct file *file, |
203 | struct gendisk *disk, unsigned cmd, unsigned long arg) | 203 | struct gendisk *disk, unsigned cmd, unsigned long arg) |
204 | { | 204 | { |
205 | int ret; | 205 | int ret; |
206 | if (disk->fops->unlocked_ioctl) | 206 | if (disk->fops->unlocked_ioctl) |
@@ -215,6 +215,7 @@ static int blkdev_driver_ioctl(struct inode *inode, struct file *file, | |||
215 | 215 | ||
216 | return -ENOTTY; | 216 | return -ENOTTY; |
217 | } | 217 | } |
218 | EXPORT_SYMBOL_GPL(blkdev_driver_ioctl); | ||
218 | 219 | ||
219 | int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd, | 220 | int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd, |
220 | unsigned long arg) | 221 | unsigned long arg) |