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

Commit 14f9f7b2 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

BKL-removal: convert ext2 over to use unlocked_ioctl 



I checked ext2_ioctl and could not find anything in there that would need the
BKL.  So convert it over to use unlocked_ioctl

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f762e905

fs/ext2/dir.c

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

	.read		= generic_read_dir,

	.readdir	= ext2_readdir,

	.ioctl		= ext2_ioctl,

	.unlocked_ioctl = ext2_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext2_compat_ioctl,

#endif

fs/ext2/ext2.h

+1 −2
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ int __ext2_write_begin(struct file *file, struct address_space *mapping, 
		struct page **pagep, void **fsdata);



/* ioctl.c */

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

		       unsigned long);

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

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



/* namei.c */

fs/ext2/file.c

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ const struct file_operations ext2_file_operations = { 
	.write		= do_sync_write,

	.aio_read	= generic_file_aio_read,

	.aio_write	= generic_file_aio_write,

	.ioctl		= ext2_ioctl,

	.unlocked_ioctl = ext2_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext2_compat_ioctl,

#endif
@@ -65,7 +65,7 @@ const struct file_operations ext2_xip_file_operations = { 
	.llseek		= generic_file_llseek,

	.read		= xip_file_read,

	.write		= xip_file_write,

	.ioctl		= ext2_ioctl,

	.unlocked_ioctl = ext2_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext2_compat_ioctl,

#endif

fs/ext2/ioctl.c

+3 −9
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
#include <asm/uaccess.h>





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

		unsigned long arg)

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

{

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

	struct ext2_inode_info *ei = EXT2_I(inode);

	unsigned int flags;

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

long ext2_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 EXT2_IOC32_GETFLAGS:
@@ -161,9 +158,6 @@ long ext2_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	default:

		return -ENOIOCTLCMD;

	}

	lock_kernel();

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

	unlock_kernel();

	return ret;

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

}

#endif