diff options
Diffstat (limited to 'fs/ioctl.c')
| -rw-r--r-- | fs/ioctl.c | 40 | 
1 files changed, 0 insertions, 40 deletions
diff --git a/fs/ioctl.c b/fs/ioctl.c index e92fdbb3bc3..d6cc1647662 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c @@ -6,7 +6,6 @@  #include <linux/syscalls.h>  #include <linux/mm.h> -#include <linux/smp_lock.h>  #include <linux/capability.h>  #include <linux/file.h>  #include <linux/fs.h> @@ -530,41 +529,6 @@ static int ioctl_fsthaw(struct file *filp)  	return thaw_super(sb);  } -static int ioctl_fstrim(struct file *filp, void __user *argp) -{ -	struct super_block *sb = filp->f_path.dentry->d_inode->i_sb; -	struct fstrim_range range; -	int ret = 0; - -	if (!capable(CAP_SYS_ADMIN)) -		return -EPERM; - -	/* If filesystem doesn't support trim feature, return. */ -	if (sb->s_op->trim_fs == NULL) -		return -EOPNOTSUPP; - -	/* If a blockdevice-backed filesystem isn't specified, return EINVAL. */ -	if (sb->s_bdev == NULL) -		return -EINVAL; - -	if (argp == NULL) { -		range.start = 0; -		range.len = ULLONG_MAX; -		range.minlen = 0; -	} else if (copy_from_user(&range, argp, sizeof(range))) -		return -EFAULT; - -	ret = sb->s_op->trim_fs(sb, &range); -	if (ret < 0) -		return ret; - -	if ((argp != NULL) && -	    (copy_to_user(argp, &range, sizeof(range)))) -		return -EFAULT; - -	return 0; -} -  /*   * When you add any new common ioctls to the switches above and below   * please update compat_sys_ioctl() too. @@ -615,10 +579,6 @@ int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,  		error = ioctl_fsthaw(filp);  		break; -	case FITRIM: -		error = ioctl_fstrim(filp, argp); -		break; -  	case FS_IOC_FIEMAP:  		return ioctl_fiemap(filp, arg);  |