xfs: remove the XFS_IOC_{ALLOC,FREE}SP* definitions

Now that we've made these ioctls defunct, move them from xfs_fs.h to
xfs_ioctl.c, which effectively removes them from the publicly supported
ioctl interfaces for XFS.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>

+13 -8
+4 -4
fs/xfs/libxfs/xfs_fs.h
··· 760 760 * For 'documentation' purposed more than anything else, 761 761 * the "cmd #" field reflects the IRIX fcntl number. 762 762 */ 763 - #define XFS_IOC_ALLOCSP _IOW ('X', 10, struct xfs_flock64) 764 - #define XFS_IOC_FREESP _IOW ('X', 11, struct xfs_flock64) 763 + /* XFS_IOC_ALLOCSP ------- deprecated 10 */ 764 + /* XFS_IOC_FREESP -------- deprecated 11 */ 765 765 #define XFS_IOC_DIOINFO _IOR ('X', 30, struct dioattr) 766 766 #define XFS_IOC_FSGETXATTR FS_IOC_FSGETXATTR 767 767 #define XFS_IOC_FSSETXATTR FS_IOC_FSSETXATTR 768 - #define XFS_IOC_ALLOCSP64 _IOW ('X', 36, struct xfs_flock64) 769 - #define XFS_IOC_FREESP64 _IOW ('X', 37, struct xfs_flock64) 768 + /* XFS_IOC_ALLOCSP64 ----- deprecated 36 */ 769 + /* XFS_IOC_FREESP64 ------ deprecated 37 */ 770 770 #define XFS_IOC_GETBMAP _IOWR('X', 38, struct getbmap) 771 771 /* XFS_IOC_FSSETDM ------- deprecated 39 */ 772 772 #define XFS_IOC_RESVSP _IOW ('X', 40, struct xfs_flock64)
+9
fs/xfs/xfs_ioctl.c
··· 1855 1855 } 1856 1856 1857 1857 /* 1858 + * These long-unused ioctls were removed from the official ioctl API in 5.17, 1859 + * but retain these definitions so that we can log warnings about them. 1860 + */ 1861 + #define XFS_IOC_ALLOCSP _IOW ('X', 10, struct xfs_flock64) 1862 + #define XFS_IOC_FREESP _IOW ('X', 11, struct xfs_flock64) 1863 + #define XFS_IOC_ALLOCSP64 _IOW ('X', 36, struct xfs_flock64) 1864 + #define XFS_IOC_FREESP64 _IOW ('X', 37, struct xfs_flock64) 1865 + 1866 + /* 1858 1867 * Note: some of the ioctl's return positive numbers as a 1859 1868 * byte count indicating success, such as readlink_by_handle. 1860 1869 * So we don't "sign flip" like most other routines. This means
-4
fs/xfs/xfs_ioctl32.h
··· 154 154 __s32 l_pad[4]; /* reserve area */ 155 155 } compat_xfs_flock64_t; 156 156 157 - #define XFS_IOC_ALLOCSP_32 _IOW('X', 10, struct compat_xfs_flock64) 158 - #define XFS_IOC_FREESP_32 _IOW('X', 11, struct compat_xfs_flock64) 159 - #define XFS_IOC_ALLOCSP64_32 _IOW('X', 36, struct compat_xfs_flock64) 160 - #define XFS_IOC_FREESP64_32 _IOW('X', 37, struct compat_xfs_flock64) 161 157 #define XFS_IOC_RESVSP_32 _IOW('X', 40, struct compat_xfs_flock64) 162 158 #define XFS_IOC_UNRESVSP_32 _IOW('X', 41, struct compat_xfs_flock64) 163 159 #define XFS_IOC_RESVSP64_32 _IOW('X', 42, struct compat_xfs_flock64)