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

Commit 039fd8ce authored by Cyrus Massoumi's avatar Cyrus Massoumi Committed by Linus Torvalds
Browse files

ext3: remove the BKL in ext3/ioctl.c 



Reformat ext3/ioctl.c to make it look more like ext4/ioctl.c and remove
the BKL around ext3_ioctl().

Signed-off-by: default avatarCyrus Massoumi <cyrusm@gmx.net>
Cc: <linux-ext4@vger.kernel.org>
Acked-by: default avatarJan Kara <jack@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b277c884

fs/ext3/dir.c

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

	.read		= generic_read_dir,

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

	.ioctl		= ext3_ioctl,		/* BKL held */

	.unlocked_ioctl	= ext3_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext3_compat_ioctl,

#endif

fs/ext3/file.c

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

	.aio_read	= generic_file_aio_read,

	.aio_write	= ext3_file_write,

	.ioctl		= ext3_ioctl,

	.unlocked_ioctl	= ext3_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext3_compat_ioctl,

#endif

fs/ext3/ioctl.c

+20 −39
Original line number Diff line number Diff line
@@ -15,12 +15,11 @@ 
#include <linux/mount.h>

#include <linux/time.h>

#include <linux/compat.h>

#include <linux/smp_lock.h>

#include <asm/uaccess.h>



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

		unsigned long arg)

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

{

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

	struct ext3_inode_info *ei = EXT3_I(inode);

	unsigned int flags;

	unsigned short rsv_window_size;
@@ -39,29 +38,25 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, 
		unsigned int oldflags;

		unsigned int jflag;



		if (!is_owner_or_cap(inode))

			return -EACCES;



		if (get_user(flags, (int __user *) arg))

			return -EFAULT;



		err = mnt_want_write(filp->f_path.mnt);

		if (err)

			return err;



		if (!is_owner_or_cap(inode)) {

			err = -EACCES;

			goto flags_out;

		}



		if (get_user(flags, (int __user *) arg)) {

			err = -EFAULT;

			goto flags_out;

		}



		flags = ext3_mask_flags(inode->i_mode, flags);



		mutex_lock(&inode->i_mutex);



		/* Is it quota file? Do not allow user to mess with it */

		if (IS_NOQUOTA(inode)) {

			mutex_unlock(&inode->i_mutex);

		err = -EPERM;

		if (IS_NOQUOTA(inode))

			goto flags_out;

		}



		oldflags = ei->i_flags;



		/* The JOURNAL_DATA flag is modifiable only by root */
@@ -74,29 +69,21 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, 
		 * This test looks nicer. Thanks to Pauline Middelink

		 */

		if ((flags ^ oldflags) & (EXT3_APPEND_FL | EXT3_IMMUTABLE_FL)) {

			if (!capable(CAP_LINUX_IMMUTABLE)) {

				mutex_unlock(&inode->i_mutex);

				err = -EPERM;

			if (!capable(CAP_LINUX_IMMUTABLE))

				goto flags_out;

		}

		}



		/*

		 * The JOURNAL_DATA flag can only be changed by

		 * the relevant capability.

		 */

		if ((jflag ^ oldflags) & (EXT3_JOURNAL_DATA_FL)) {

			if (!capable(CAP_SYS_RESOURCE)) {

				mutex_unlock(&inode->i_mutex);

				err = -EPERM;

			if (!capable(CAP_SYS_RESOURCE))

				goto flags_out;

		}

		}





		handle = ext3_journal_start(inode, 1);

		if (IS_ERR(handle)) {

			mutex_unlock(&inode->i_mutex);

			err = PTR_ERR(handle);

			goto flags_out;

		}
@@ -116,15 +103,13 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, 
		err = ext3_mark_iloc_dirty(handle, inode, &iloc);

flags_err:

		ext3_journal_stop(handle);

		if (err) {

			mutex_unlock(&inode->i_mutex);

			return err;

		}

		if (err)

			goto flags_out;



		if ((jflag ^ oldflags) & (EXT3_JOURNAL_DATA_FL))

			err = ext3_change_inode_journal_flag(inode, jflag);

		mutex_unlock(&inode->i_mutex);

flags_out:

		mutex_unlock(&inode->i_mutex);

		mnt_drop_write(filp->f_path.mnt);

		return err;

	}
@@ -140,6 +125,7 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, 


		if (!is_owner_or_cap(inode))

			return -EPERM;



		err = mnt_want_write(filp->f_path.mnt);

		if (err)

			return err;
@@ -147,6 +133,7 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, 
			err = -EFAULT;

			goto setversion_out;

		}



		handle = ext3_journal_start(inode, 1);

		if (IS_ERR(handle)) {

			err = PTR_ERR(handle);
@@ -299,9 +286,6 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, 
#ifdef CONFIG_COMPAT

long ext3_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 EXT3_IOC32_GETFLAGS:
@@ -341,9 +325,6 @@ long ext3_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	default:

		return -ENOIOCTLCMD;

	}

	lock_kernel();

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

	unlock_kernel();

	return ret;

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

}

#endif

include/linux/ext3_fs.h

+2 −3
Original line number Diff line number Diff line
@@ -893,8 +893,7 @@ extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 
		       u64 start, u64 len);



/* ioctl.c */

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

		       unsigned long);

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

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



/* namei.c */