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

Commit 27a4f7e6 authored by Namhyung Kim's avatar Namhyung Kim Committed by Al Viro
Browse files

vfs: cleanup do_vfs_ioctl() 



Move declaration of 'inode' to beginning of the function. Since it
is referenced directly or indirectly (in case of FIFREEZE/FITHAW/
FS_IOC_FIEMAP) it's not harmful IMHO. And remove unnecessary casts
using 'argp' instead.

Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a44f99c7

fs/ioctl.c

+8 −13
Original line number Diff line number Diff line
@@ -548,6 +548,7 @@ int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, 
{

	int error = 0;

	int __user *argp = (int __user *)arg;

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



	switch (cmd) {

	case FIOCLEX:
@@ -567,13 +568,11 @@ int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, 
		break;



	case FIOQSIZE:

		if (S_ISDIR(filp->f_path.dentry->d_inode->i_mode) ||

		    S_ISREG(filp->f_path.dentry->d_inode->i_mode) ||

		    S_ISLNK(filp->f_path.dentry->d_inode->i_mode)) {

			loff_t res =

				inode_get_bytes(filp->f_path.dentry->d_inode);

			error = copy_to_user((loff_t __user *)arg, &res,

					     sizeof(res)) ? -EFAULT : 0;

		if (S_ISDIR(inode->i_mode) || S_ISREG(inode->i_mode) ||

		    S_ISLNK(inode->i_mode)) {

			loff_t res = inode_get_bytes(inode);

			error = copy_to_user(argp, &res, sizeof(res)) ?

					-EFAULT : 0;

		} else

			error = -ENOTTY;

		break;
@@ -590,14 +589,10 @@ int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, 
		return ioctl_fiemap(filp, arg);



	case FIGETBSZ:

	{

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

		int __user *p = (int __user *)arg;

		return put_user(inode->i_sb->s_blocksize, p);

	}

		return put_user(inode->i_sb->s_blocksize, argp);



	default:

		if (S_ISREG(filp->f_path.dentry->d_inode->i_mode))

		if (S_ISREG(inode->i_mode))

			error = file_ioctl(filp, cmd, arg);

		else

			error = vfs_ioctl(filp, cmd, arg);