Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76c072b4 authored by Milan Broz's avatar Milan Broz Committed by Alasdair G Kergon
Browse files

dm ioctl: move compat code 



Move compat_ioctl handling into dm-ioctl.c.

Signed-off-by: default avatarMilan Broz <mbroz@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 27238b2b

drivers/md/dm-ioctl.c

+13 −2
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/dm-ioctl.h>

#include <linux/dm-ioctl.h>

#include <linux/hdreg.h>

#include <linux/hdreg.h>

#include <linux/compat.h>





#include <asm/uaccess.h>

#include <asm/uaccess.h>
@@ -1350,10 +1351,10 @@ static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl **param) 
{

{

	struct dm_ioctl tmp, *dmi;

	struct dm_ioctl tmp, *dmi;





	if (copy_from_user(&tmp, user, sizeof(tmp)))

	if (copy_from_user(&tmp, user, sizeof(tmp) - sizeof(tmp.data)))

		return -EFAULT;

		return -EFAULT;





	if (tmp.data_size < sizeof(tmp))

	if (tmp.data_size < (sizeof(tmp) - sizeof(tmp.data)))

		return -EINVAL;

		return -EINVAL;





	dmi = vmalloc(tmp.data_size);

	dmi = vmalloc(tmp.data_size);
@@ -1474,8 +1475,18 @@ static long dm_ctl_ioctl(struct file *file, uint command, ulong u) 
	return (long)ctl_ioctl(command, (struct dm_ioctl __user *)u);

	return (long)ctl_ioctl(command, (struct dm_ioctl __user *)u);

}

}





#ifdef CONFIG_COMPAT

static long dm_compat_ctl_ioctl(struct file *file, uint command, ulong u)

{

	return (long)dm_ctl_ioctl(file, command, (ulong) compat_ptr(u));

}

#else

#define dm_compat_ctl_ioctl NULL

#endif



static const struct file_operations _ctl_fops = {

static const struct file_operations _ctl_fops = {

	.unlocked_ioctl	 = dm_ctl_ioctl,

	.unlocked_ioctl	 = dm_ctl_ioctl,

	.compat_ioctl = dm_compat_ctl_ioctl,

	.owner	 = THIS_MODULE,

	.owner	 = THIS_MODULE,

};

};

fs/compat_ioctl.c

+0 −34
Original line number Original line Diff line number Diff line
@@ -78,7 +78,6 @@ 
#include <linux/mii.h>

#include <linux/mii.h>

#include <linux/if_bonding.h>

#include <linux/if_bonding.h>

#include <linux/watchdog.h>

#include <linux/watchdog.h>

#include <linux/dm-ioctl.h>





#include <linux/soundcard.h>

#include <linux/soundcard.h>

#include <linux/lp.h>

#include <linux/lp.h>
@@ -1993,39 +1992,6 @@ COMPATIBLE_IOCTL(STOP_ARRAY_RO) 
COMPATIBLE_IOCTL(RESTART_ARRAY_RW)

COMPATIBLE_IOCTL(RESTART_ARRAY_RW)

COMPATIBLE_IOCTL(GET_BITMAP_FILE)

COMPATIBLE_IOCTL(GET_BITMAP_FILE)

ULONG_IOCTL(SET_BITMAP_FILE)

ULONG_IOCTL(SET_BITMAP_FILE)

/* DM */

COMPATIBLE_IOCTL(DM_VERSION_32)

COMPATIBLE_IOCTL(DM_REMOVE_ALL_32)

COMPATIBLE_IOCTL(DM_LIST_DEVICES_32)

COMPATIBLE_IOCTL(DM_DEV_CREATE_32)

COMPATIBLE_IOCTL(DM_DEV_REMOVE_32)

COMPATIBLE_IOCTL(DM_DEV_RENAME_32)

COMPATIBLE_IOCTL(DM_DEV_SUSPEND_32)

COMPATIBLE_IOCTL(DM_DEV_STATUS_32)

COMPATIBLE_IOCTL(DM_DEV_WAIT_32)

COMPATIBLE_IOCTL(DM_TABLE_LOAD_32)

COMPATIBLE_IOCTL(DM_TABLE_CLEAR_32)

COMPATIBLE_IOCTL(DM_TABLE_DEPS_32)

COMPATIBLE_IOCTL(DM_TABLE_STATUS_32)

COMPATIBLE_IOCTL(DM_LIST_VERSIONS_32)

COMPATIBLE_IOCTL(DM_TARGET_MSG_32)

COMPATIBLE_IOCTL(DM_DEV_SET_GEOMETRY_32)

COMPATIBLE_IOCTL(DM_VERSION)

COMPATIBLE_IOCTL(DM_REMOVE_ALL)

COMPATIBLE_IOCTL(DM_LIST_DEVICES)

COMPATIBLE_IOCTL(DM_DEV_CREATE)

COMPATIBLE_IOCTL(DM_DEV_REMOVE)

COMPATIBLE_IOCTL(DM_DEV_RENAME)

COMPATIBLE_IOCTL(DM_DEV_SUSPEND)

COMPATIBLE_IOCTL(DM_DEV_STATUS)

COMPATIBLE_IOCTL(DM_DEV_WAIT)

COMPATIBLE_IOCTL(DM_TABLE_LOAD)

COMPATIBLE_IOCTL(DM_TABLE_CLEAR)

COMPATIBLE_IOCTL(DM_TABLE_DEPS)

COMPATIBLE_IOCTL(DM_TABLE_STATUS)

COMPATIBLE_IOCTL(DM_LIST_VERSIONS)

COMPATIBLE_IOCTL(DM_TARGET_MSG)

COMPATIBLE_IOCTL(DM_DEV_SET_GEOMETRY)

/* Big K */

/* Big K */

COMPATIBLE_IOCTL(PIO_FONT)

COMPATIBLE_IOCTL(PIO_FONT)

COMPATIBLE_IOCTL(GIO_FONT)

COMPATIBLE_IOCTL(GIO_FONT)

include/linux/dm-ioctl.h

+2 −32
Original line number Original line Diff line number Diff line
@@ -232,36 +232,6 @@ enum { 
	DM_DEV_SET_GEOMETRY_CMD

	DM_DEV_SET_GEOMETRY_CMD

};

};





/*

 * The dm_ioctl struct passed into the ioctl is just the header

 * on a larger chunk of memory.  On x86-64 and other

 * architectures the dm-ioctl struct will be padded to an 8 byte

 * boundary so the size will be different, which would change the

 * ioctl code - yes I really messed up.  This hack forces these

 * architectures to have the correct ioctl code.

 */

#ifdef CONFIG_COMPAT

typedef char ioctl_struct[308];

#define DM_VERSION_32       _IOWR(DM_IOCTL, DM_VERSION_CMD, ioctl_struct)

#define DM_REMOVE_ALL_32    _IOWR(DM_IOCTL, DM_REMOVE_ALL_CMD, ioctl_struct)

#define DM_LIST_DEVICES_32  _IOWR(DM_IOCTL, DM_LIST_DEVICES_CMD, ioctl_struct)



#define DM_DEV_CREATE_32    _IOWR(DM_IOCTL, DM_DEV_CREATE_CMD, ioctl_struct)

#define DM_DEV_REMOVE_32    _IOWR(DM_IOCTL, DM_DEV_REMOVE_CMD, ioctl_struct)

#define DM_DEV_RENAME_32    _IOWR(DM_IOCTL, DM_DEV_RENAME_CMD, ioctl_struct)

#define DM_DEV_SUSPEND_32   _IOWR(DM_IOCTL, DM_DEV_SUSPEND_CMD, ioctl_struct)

#define DM_DEV_STATUS_32    _IOWR(DM_IOCTL, DM_DEV_STATUS_CMD, ioctl_struct)

#define DM_DEV_WAIT_32      _IOWR(DM_IOCTL, DM_DEV_WAIT_CMD, ioctl_struct)



#define DM_TABLE_LOAD_32    _IOWR(DM_IOCTL, DM_TABLE_LOAD_CMD, ioctl_struct)

#define DM_TABLE_CLEAR_32   _IOWR(DM_IOCTL, DM_TABLE_CLEAR_CMD, ioctl_struct)

#define DM_TABLE_DEPS_32    _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, ioctl_struct)

#define DM_TABLE_STATUS_32  _IOWR(DM_IOCTL, DM_TABLE_STATUS_CMD, ioctl_struct)

#define DM_LIST_VERSIONS_32 _IOWR(DM_IOCTL, DM_LIST_VERSIONS_CMD, ioctl_struct)

#define DM_TARGET_MSG_32    _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, ioctl_struct)

#define DM_DEV_SET_GEOMETRY_32	_IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, ioctl_struct)

#endif



#define DM_IOCTL 0xfd

#define DM_IOCTL 0xfd





#define DM_VERSION       _IOWR(DM_IOCTL, DM_VERSION_CMD, struct dm_ioctl)

#define DM_VERSION       _IOWR(DM_IOCTL, DM_VERSION_CMD, struct dm_ioctl)
@@ -286,9 +256,9 @@ typedef char ioctl_struct[308]; 
#define DM_DEV_SET_GEOMETRY	_IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)

#define DM_DEV_SET_GEOMETRY	_IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)





#define DM_VERSION_MAJOR	4

#define DM_VERSION_MAJOR	4

#define DM_VERSION_MINOR	12

#define DM_VERSION_MINOR	13

#define DM_VERSION_PATCHLEVEL	0

#define DM_VERSION_PATCHLEVEL	0

#define DM_VERSION_EXTRA	"-ioctl (2007-10-02)"

#define DM_VERSION_EXTRA	"-ioctl (2007-10-18)"





/* Status bits */

/* Status bits */

#define DM_READONLY_FLAG	(1 << 0) /* In/Out */

#define DM_READONLY_FLAG	(1 << 0) /* In/Out */