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

Commit e322ff07 authored by David Howells's avatar David Howells Committed by Jens Axboe
Browse files

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



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

Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 52b499c4

fs/compat_ioctl.c

+0 −17
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include <linux/tty.h>

#include <linux/vt_kern.h>

#include <linux/fb.h>

#include <linux/ext2_fs.h>

#include <linux/ext3_jbd.h>

#include <linux/ext3_fs.h>

#include <linux/videodev.h>
@@ -159,18 +158,6 @@ static int rw_long(unsigned int fd, unsigned int cmd, unsigned long arg) 
	return err;

}



static int do_ext2_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)

{

	/* These are just misnamed, they actually get/put from/to user an int */

	switch (cmd) {

	case EXT2_IOC32_GETFLAGS: cmd = EXT2_IOC_GETFLAGS; break;

	case EXT2_IOC32_SETFLAGS: cmd = EXT2_IOC_SETFLAGS; break;

	case EXT2_IOC32_GETVERSION: cmd = EXT2_IOC_GETVERSION; break;

	case EXT2_IOC32_SETVERSION: cmd = EXT2_IOC_SETVERSION; break;

	}

	return sys_ioctl(fd, cmd, (unsigned long)compat_ptr(arg));

}



static int do_ext3_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)

{

	/* These are just misnamed, they actually get/put from/to user an int */
@@ -2725,10 +2712,6 @@ HANDLE_IOCTL(PIO_UNIMAP, do_unimap_ioctl) 
HANDLE_IOCTL(GIO_UNIMAP, do_unimap_ioctl)

HANDLE_IOCTL(KDFONTOP, do_kdfontop_ioctl)

#endif

HANDLE_IOCTL(EXT2_IOC32_GETFLAGS, do_ext2_ioctl)

HANDLE_IOCTL(EXT2_IOC32_SETFLAGS, do_ext2_ioctl)

HANDLE_IOCTL(EXT2_IOC32_GETVERSION, do_ext2_ioctl)

HANDLE_IOCTL(EXT2_IOC32_SETVERSION, do_ext2_ioctl)

HANDLE_IOCTL(EXT3_IOC32_GETVERSION, do_ext3_ioctl)

HANDLE_IOCTL(EXT3_IOC32_SETVERSION, do_ext3_ioctl)

HANDLE_IOCTL(EXT3_IOC32_GETRSVSZ, do_ext3_ioctl)

fs/ext2/dir.c

+3 −0
Original line number Diff line number Diff line
@@ -661,5 +661,8 @@ const struct file_operations ext2_dir_operations = { 
	.read		= generic_read_dir,

	.readdir	= ext2_readdir,

	.ioctl		= ext2_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext2_compat_ioctl,

#endif

	.fsync		= ext2_sync_file,

};

fs/ext2/ext2.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ extern void ext2_set_inode_flags(struct inode *inode); 
/* ioctl.c */

extern int ext2_ioctl (struct inode *, struct file *, unsigned int,

		       unsigned long);

extern long ext2_compat_ioctl(struct file *, unsigned int, unsigned long);



/* namei.c */

struct dentry *ext2_get_parent(struct dentry *child);

fs/ext2/file.c

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ const struct file_operations ext2_file_operations = { 
	.aio_read	= generic_file_aio_read,

	.aio_write	= generic_file_aio_write,

	.ioctl		= ext2_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext2_compat_ioctl,

#endif

	.mmap		= generic_file_mmap,

	.open		= generic_file_open,

	.release	= ext2_release_file,
@@ -63,6 +66,9 @@ const struct file_operations ext2_xip_file_operations = { 
	.read		= xip_file_read,

	.write		= xip_file_write,

	.ioctl		= ext2_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext2_compat_ioctl,

#endif

	.mmap		= xip_file_mmap,

	.open		= generic_file_open,

	.release	= ext2_release_file,

fs/ext2/ioctl.c

+32 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <linux/capability.h>

#include <linux/time.h>

#include <linux/sched.h>

#include <linux/compat.h>

#include <linux/smp_lock.h>

#include <asm/current.h>

#include <asm/uaccess.h>
@@ -80,3 +82,33 @@ int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, 
		return -ENOTTY;

	}

}



#ifdef CONFIG_COMPAT

long ext2_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	struct inode *inode = file->f_dentry->d_inode;

	int ret;



	/* These are just misnamed, they actually get/put from/to user an int */

	switch (cmd) {

	case EXT2_IOC32_GETFLAGS:

		cmd = EXT2_IOC_GETFLAGS;

		break;

	case EXT2_IOC32_SETFLAGS:

		cmd = EXT2_IOC_SETFLAGS;

		break;

	case EXT2_IOC32_GETVERSION:

		cmd = EXT2_IOC_GETVERSION;

		break;

	case EXT2_IOC32_SETVERSION:

		cmd = EXT2_IOC_SETVERSION;

		break;

	default:

		return -ENOIOCTLCMD;

	}

	lock_kernel();

	ret = ext2_ioctl(inode, file, cmd, (unsigned long) compat_ptr(arg));

	unlock_kernel();

	return ret;

}

#endif