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

Commit 668ff9ab authored by Kevin Cernekee's avatar Kevin Cernekee Committed by David Woodhouse
Browse files

mtd: Handle compat ioctls directly; remove all trace from compat_ioctl.c 



Remove all references to MTD ioctls from fs/compat_ioctl.c and let
them all be handled by mtd_compat_ioctl().

Signed-off-by: default avatarKevin Cernekee <kpc.mtd@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent aea7cea9

drivers/mtd/mtdchar.c

+2 −1
Original line number Diff line number Diff line
@@ -836,6 +836,7 @@ struct mtd_oob_buf32 { 
static long mtd_compat_ioctl(struct file *file, unsigned int cmd,

	unsigned long arg)

{

	struct inode *inode = file->f_path.dentry->d_inode;

	struct mtd_file_info *mfi = file->private_data;

	struct mtd_info *mtd = mfi->mtd;

	void __user *argp = (void __user *)arg;
@@ -873,7 +874,7 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd, 
		break;

	}

	default:

		ret = -ENOIOCTLCMD;

		ret = mtd_ioctl(inode, file, cmd, arg);

	}



	unlock_kernel();

fs/compat_ioctl.c

+0 −22
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ 
#include <linux/atm_tcp.h>

#include <linux/sonet.h>

#include <linux/atm_suni.h>

#include <linux/mtd/mtd.h>



#include <linux/usb.h>

#include <linux/usbdevice_fs.h>
@@ -2392,27 +2391,6 @@ COMPATIBLE_IOCTL(USBDEVFS_SUBMITURB32) 
COMPATIBLE_IOCTL(USBDEVFS_REAPURB32)

COMPATIBLE_IOCTL(USBDEVFS_REAPURBNDELAY32)

COMPATIBLE_IOCTL(USBDEVFS_CLEAR_HALT)

/* MTD */

COMPATIBLE_IOCTL(MEMGETINFO)

COMPATIBLE_IOCTL(MEMERASE)

COMPATIBLE_IOCTL(MEMLOCK)

COMPATIBLE_IOCTL(MEMUNLOCK)

COMPATIBLE_IOCTL(MEMGETREGIONCOUNT)

COMPATIBLE_IOCTL(MEMGETREGIONINFO)

COMPATIBLE_IOCTL(MEMSETOOBSEL)

COMPATIBLE_IOCTL(MEMGETOOBSEL)

COMPATIBLE_IOCTL(MEMGETBADBLOCK)

COMPATIBLE_IOCTL(MEMSETBADBLOCK)

COMPATIBLE_IOCTL(OTPSELECT)

COMPATIBLE_IOCTL(OTPGETREGIONCOUNT)

COMPATIBLE_IOCTL(OTPGETREGIONINFO)

COMPATIBLE_IOCTL(OTPLOCK)

COMPATIBLE_IOCTL(ECCGETLAYOUT)

COMPATIBLE_IOCTL(ECCGETSTATS)

COMPATIBLE_IOCTL(MTDFILEMODE)

COMPATIBLE_IOCTL(MEMERASE64)

COMPATIBLE_IOCTL(MEMREADOOB64)

COMPATIBLE_IOCTL(MEMWRITEOOB64)

/* NBD */

ULONG_IOCTL(NBD_SET_SOCK)

ULONG_IOCTL(NBD_SET_BLKSIZE)