Commit 314999dc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

fs: compat_ioctl: move FITRIM emulation into file systems 



Remove the special case for FITRIM, and make file systems
handle that like all other ioctl commands with their own
handlers.

Cc: linux-ext4@vger.kernel.org
Cc: linux-f2fs-devel@lists.sourceforge.net
Cc: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Cc: linux-nilfs@vger.kernel.org
Cc: ocfs2-devel@oss.oracle.com
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 8d098070

fs/compat_ioctl.c

+0 −2
Original line number Diff line number Diff line
@@ -345,8 +345,6 @@ static int ppp_scompress(struct file *file, unsigned int cmd, 
static unsigned int ioctl_pointer[] = {

/* Little t */

COMPATIBLE_IOCTL(TIOCOUTQ)

/* 'X' - originally XFS but some now in the VFS */

COMPATIBLE_IOCTL(FITRIM)

#ifdef CONFIG_BLOCK

/* Big S */

COMPATIBLE_IOCTL(SCSI_IOCTL_GET_IDLUN)

fs/ecryptfs/file.c

+1 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ ecryptfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		return rc;



	switch (cmd) {

	case FITRIM:

	case FS_IOC32_GETFLAGS:

	case FS_IOC32_SETFLAGS:

	case FS_IOC32_GETVERSION:

fs/ext4/ioctl.c

+1 −0
Original line number Diff line number Diff line
@@ -1360,6 +1360,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	}

	case EXT4_IOC_MOVE_EXT:

	case EXT4_IOC_RESIZE_FS:

	case FITRIM:

	case EXT4_IOC_PRECACHE_EXTENTS:

	case EXT4_IOC_SET_ENCRYPTION_POLICY:

	case EXT4_IOC_GET_ENCRYPTION_PWSALT:

fs/f2fs/file.c

+1 −0
Original line number Diff line number Diff line
@@ -3403,6 +3403,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case F2FS_IOC_RELEASE_VOLATILE_WRITE:

	case F2FS_IOC_ABORT_VOLATILE_WRITE:

	case F2FS_IOC_SHUTDOWN:

	case FITRIM:

	case F2FS_IOC_SET_ENCRYPTION_POLICY:

	case F2FS_IOC_GET_ENCRYPTION_PWSALT:

	case F2FS_IOC_GET_ENCRYPTION_POLICY:

fs/hpfs/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -325,4 +325,5 @@ const struct file_operations hpfs_dir_ops = 
	.release	= hpfs_dir_release,

	.fsync		= hpfs_file_fsync,

	.unlocked_ioctl	= hpfs_ioctl,

	.compat_ioctl	= compat_ptr_ioctl,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE