Commit 9afe1d5c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: don't implement XFS_IOC_RESVSP / XFS_IOC_RESVSP64 



These ioctls are implemented by the VFS and mapped to ->fallocate now,
so this code won't ever be reached.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent c7d68318

fs/xfs/xfs_ioctl.c

+0 −10
Original line number Diff line number Diff line
@@ -643,8 +643,6 @@ xfs_ioc_space( 
	 */

	switch (cmd) {

	case XFS_IOC_ZERO_RANGE:

	case XFS_IOC_RESVSP:

	case XFS_IOC_RESVSP64:

	case XFS_IOC_UNRESVSP:

	case XFS_IOC_UNRESVSP64:

		if (bf->l_len <= 0) {
@@ -670,12 +668,6 @@ xfs_ioc_space( 
		flags |= XFS_PREALLOC_SET;

		error = xfs_zero_file_space(ip, bf->l_start, bf->l_len);

		break;

	case XFS_IOC_RESVSP:

	case XFS_IOC_RESVSP64:

		flags |= XFS_PREALLOC_SET;

		error = xfs_alloc_file_space(ip, bf->l_start, bf->l_len,

						XFS_BMAPI_PREALLOC);

		break;

	case XFS_IOC_UNRESVSP:

	case XFS_IOC_UNRESVSP64:

		error = xfs_free_file_space(ip, bf->l_start, bf->l_len);
@@ -2121,11 +2113,9 @@ xfs_file_ioctl( 
		return xfs_ioc_setlabel(filp, mp, arg);

	case XFS_IOC_ALLOCSP:

	case XFS_IOC_FREESP:

	case XFS_IOC_RESVSP:

	case XFS_IOC_UNRESVSP:

	case XFS_IOC_ALLOCSP64:

	case XFS_IOC_FREESP64:

	case XFS_IOC_RESVSP64:

	case XFS_IOC_UNRESVSP64:

	case XFS_IOC_ZERO_RANGE: {

		xfs_flock64_t		bf;

fs/xfs/xfs_ioctl32.c

+0 −2
Original line number Diff line number Diff line
@@ -558,8 +558,6 @@ xfs_file_compat_ioctl( 
	case XFS_IOC_FREESP_32:

	case XFS_IOC_ALLOCSP64_32:

	case XFS_IOC_FREESP64_32:

	case XFS_IOC_RESVSP_32:

	case XFS_IOC_UNRESVSP_32:

	case XFS_IOC_RESVSP64_32:

	case XFS_IOC_UNRESVSP64_32:

	case XFS_IOC_ZERO_RANGE_32: {