[PATCH] BLOCK: Move the loop device ioctl compat stuff to the loop driver [try #6]

Move the loop device ioctl compat stuff from fs/compat_ioctl.c to the loop
driver so that the loop header file doesn't need to be included.

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 0 insertions, 68 deletions

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index ab74c9bd55fe..3b0cf7fbd95a 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -40,7 +40,6 @@
 #include <linux/if_pppox.h>
 #include <linux/mtio.h>
 #include <linux/cdrom.h>
-#include <linux/loop.h>
 #include <linux/auto_fs.h>
 #include <linux/auto_fs4.h>
 #include <linux/tty.h>
@@ -1214,71 +1213,6 @@ static int cdrom_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long ar
         return err;
 }
 
-struct loop_info32 {
-        compat_int_t    lo_number;      /* ioctl r/o */
-        compat_dev_t    lo_device;      /* ioctl r/o */
-        compat_ulong_t  lo_inode;       /* ioctl r/o */
-        compat_dev_t    lo_rdevice;     /* ioctl r/o */
-        compat_int_t    lo_offset;
-        compat_int_t    lo_encrypt_type;
-        compat_int_t    lo_encrypt_key_size;    /* ioctl w/o */
-        compat_int_t    lo_flags;       /* ioctl r/o */
-        char            lo_name[LO_NAME_SIZE];
-        unsigned char   lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
-        compat_ulong_t  lo_init[2];
-        char            reserved[4];
-};
-
-static int loop_status(unsigned int fd, unsigned int cmd, unsigned long arg)
-{
-        mm_segment_t old_fs = get_fs();
-        struct loop_info l;
-        struct loop_info32 __user *ul;
-        int err = -EINVAL;
-
-        ul = compat_ptr(arg);
-        switch(cmd) {
-        case LOOP_SET_STATUS:
-                err = get_user(l.lo_number, &ul->lo_number);
-                err |= __get_user(l.lo_device, &ul->lo_device);
-                err |= __get_user(l.lo_inode, &ul->lo_inode);
-                err |= __get_user(l.lo_rdevice, &ul->lo_rdevice);
-                err |= __copy_from_user(&l.lo_offset, &ul->lo_offset,
-                        8 + (unsigned long)l.lo_init - (unsigned long)&l.lo_offset);
-                if (err) {
-                        err = -EFAULT;
-                } else {
-                        set_fs (KERNEL_DS);
-                        err = sys_ioctl (fd, cmd, (unsigned long)&l);
-                        set_fs (old_fs);
-                }
-                break;
-        case LOOP_GET_STATUS:
-                set_fs (KERNEL_DS);
-                err = sys_ioctl (fd, cmd, (unsigned long)&l);
-                set_fs (old_fs);
-                if (!err) {
-                        err = put_user(l.lo_number, &ul->lo_number);
-                        err |= __put_user(l.lo_device, &ul->lo_device);
-                        err |= __put_user(l.lo_inode, &ul->lo_inode);
-                        err |= __put_user(l.lo_rdevice, &ul->lo_rdevice);
-                        err |= __copy_to_user(&ul->lo_offset, &l.lo_offset,
-                                (unsigned long)l.lo_init - (unsigned long)&l.lo_offset);
-                        if (err)
-                                err = -EFAULT;
-                }
-                break;
-        default: {
-                static int count;
-                if (++count <= 20)
-                        printk("%s: Unknown loop ioctl cmd, fd(%d) "
-                               "cmd(%08x) arg(%08lx)\n",
-                               __FUNCTION__, fd, cmd, arg);
-        }
-        }
-        return err;
-}
-
 #ifdef CONFIG_VT
 
 static int vt_check(struct file *file)
@@ -2808,8 +2742,6 @@ HANDLE_IOCTL(MTIOCGET32, mt_ioctl_trans)
 HANDLE_IOCTL(MTIOCPOS32, mt_ioctl_trans)
 HANDLE_IOCTL(CDROMREADAUDIO, cdrom_ioctl_trans)
 HANDLE_IOCTL(CDROM_SEND_PACKET, cdrom_ioctl_trans)
-HANDLE_IOCTL(LOOP_SET_STATUS, loop_status)
-HANDLE_IOCTL(LOOP_GET_STATUS, loop_status)
 #define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93,0x64,unsigned int)
 HANDLE_IOCTL(AUTOFS_IOC_SETTIMEOUT32, ioc_settimeout)
 #ifdef CONFIG_VT