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

Commit 5cdd7b2d authored by Andi Kleen's avatar Andi Kleen Committed by Theodore Ts'o
Browse files

Convert ext4 to use unlocked_ioctl 



I checked ext4_ioctl and it looked largely safe to not be used
without BKL.  So convert it over to unlocked_ioctl.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 161e7b7c

fs/ext4/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ const struct file_operations ext4_dir_operations = { 
	.llseek		= generic_file_llseek,

	.read		= generic_read_dir,

	.readdir	= ext4_readdir,		/* we take BKL. needed?*/

	.ioctl		= ext4_ioctl,		/* BKL held */

	.unlocked_ioctl = ext4_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext4_compat_ioctl,

#endif

fs/ext4/file.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ const struct file_operations ext4_file_operations = { 
	.write		= do_sync_write,

	.aio_read	= generic_file_aio_read,

	.aio_write	= ext4_file_write,

	.ioctl		= ext4_ioctl,

	.unlocked_ioctl = ext4_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext4_compat_ioctl,

#endif

fs/ext4/ioctl.c

+3 −9
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 
#include <linux/mount.h>

#include <asm/uaccess.h>



int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,

		unsigned long arg)

long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

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

	struct ext4_inode_info *ei = EXT4_I(inode);

	unsigned int flags;

	unsigned short rsv_window_size;
@@ -277,9 +277,6 @@ int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, 
#ifdef CONFIG_COMPAT

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

{

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

	int ret;



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

	switch (cmd) {

	case EXT4_IOC32_GETFLAGS:
@@ -319,9 +316,6 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	default:

		return -ENOIOCTLCMD;

	}

	lock_kernel();

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

	unlock_kernel();

	return ret;

	return ext4_ioctl(file, cmd, (unsigned long) compat_ptr(arg));

}

#endif

include/linux/ext4_fs.h

+1 −2
Original line number Diff line number Diff line
@@ -1050,8 +1050,7 @@ extern int ext4_block_truncate_page(handle_t *handle, struct page *page, 
		struct address_space *mapping, loff_t from);



/* ioctl.c */

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

		       unsigned long);

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

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



/* migrate.c */