diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/compat_ioctl.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index e6a94714b1b0..3baa90d31090 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <linux/netdevice.h> | 47 | #include <linux/netdevice.h> |
48 | #include <linux/raw.h> | 48 | #include <linux/raw.h> |
49 | #include <linux/smb_fs.h> | 49 | #include <linux/smb_fs.h> |
50 | #include <linux/blkpg.h> | ||
51 | #include <linux/blkdev.h> | 50 | #include <linux/blkdev.h> |
52 | #include <linux/elevator.h> | 51 | #include <linux/elevator.h> |
53 | #include <linux/rtc.h> | 52 | #include <linux/rtc.h> |
@@ -1487,37 +1486,6 @@ ret_einval(unsigned int fd, unsigned int cmd, unsigned long arg) | |||
1487 | return -EINVAL; | 1486 | return -EINVAL; |
1488 | } | 1487 | } |
1489 | 1488 | ||
1490 | #ifdef CONFIG_BLOCK | ||
1491 | struct blkpg_ioctl_arg32 { | ||
1492 | compat_int_t op; | ||
1493 | compat_int_t flags; | ||
1494 | compat_int_t datalen; | ||
1495 | compat_caddr_t data; | ||
1496 | }; | ||
1497 | |||
1498 | static int blkpg_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg) | ||
1499 | { | ||
1500 | struct blkpg_ioctl_arg32 __user *ua32 = compat_ptr(arg); | ||
1501 | struct blkpg_ioctl_arg __user *a = compat_alloc_user_space(sizeof(*a)); | ||
1502 | compat_caddr_t udata; | ||
1503 | compat_int_t n; | ||
1504 | int err; | ||
1505 | |||
1506 | err = get_user(n, &ua32->op); | ||
1507 | err |= put_user(n, &a->op); | ||
1508 | err |= get_user(n, &ua32->flags); | ||
1509 | err |= put_user(n, &a->flags); | ||
1510 | err |= get_user(n, &ua32->datalen); | ||
1511 | err |= put_user(n, &a->datalen); | ||
1512 | err |= get_user(udata, &ua32->data); | ||
1513 | err |= put_user(compat_ptr(udata), &a->data); | ||
1514 | if (err) | ||
1515 | return err; | ||
1516 | |||
1517 | return sys_ioctl(fd, cmd, (unsigned long)a); | ||
1518 | } | ||
1519 | #endif | ||
1520 | |||
1521 | static int ioc_settimeout(unsigned int fd, unsigned int cmd, unsigned long arg) | 1489 | static int ioc_settimeout(unsigned int fd, unsigned int cmd, unsigned long arg) |
1522 | { | 1490 | { |
1523 | return rw_long(fd, AUTOFS_IOC_SETTIMEOUT, arg); | 1491 | return rw_long(fd, AUTOFS_IOC_SETTIMEOUT, arg); |
@@ -3160,7 +3128,6 @@ HANDLE_IOCTL(SIOCGSTAMP, do_siocgstamp) | |||
3160 | HANDLE_IOCTL(SIOCGSTAMPNS, do_siocgstampns) | 3128 | HANDLE_IOCTL(SIOCGSTAMPNS, do_siocgstampns) |
3161 | #endif | 3129 | #endif |
3162 | #ifdef CONFIG_BLOCK | 3130 | #ifdef CONFIG_BLOCK |
3163 | HANDLE_IOCTL(BLKPG, blkpg_ioctl_trans) | ||
3164 | HANDLE_IOCTL(FDSETPRM32, fd_ioctl_trans) | 3131 | HANDLE_IOCTL(FDSETPRM32, fd_ioctl_trans) |
3165 | HANDLE_IOCTL(FDDEFPRM32, fd_ioctl_trans) | 3132 | HANDLE_IOCTL(FDDEFPRM32, fd_ioctl_trans) |
3166 | HANDLE_IOCTL(FDGETPRM32, fd_ioctl_trans) | 3133 | HANDLE_IOCTL(FDGETPRM32, fd_ioctl_trans) |