diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2022-05-06 15:22:35 -0400 |
|---|---|---|
| committer | Eric Sandeen <sandeen@sandeen.net> | 2022-05-06 15:22:35 -0400 |
| commit | 7126f90b3c1a694a4269bb1902cbbcda0e1d9100 (patch) | |
| tree | cb03399bce411795f523d6e3844807fcd9eff719 | |
| parent | e501cb4490e3e3523a28aca09e49eea3058f99a4 (diff) | |
| download | xfsprogs-dev-7126f90b3c1a694a4269bb1902cbbcda0e1d9100.tar.gz | |
xfs: remove the XFS_IOC_{ALLOC,FREE}SP* definitions
Source kernel commit: b3bb9413e717b44e4aea833d07f14e90fb91cf97
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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | io/prealloc.c | 11 | ||||
| -rw-r--r-- | libxfs/xfs_fs.h | 8 | ||||
| -rw-r--r-- | man/man3/xfsctl.3 | 2 | ||||
| -rw-r--r-- | man/man8/xfs_io.8 | 2 |
4 files changed, 19 insertions, 4 deletions
diff --git a/io/prealloc.c b/io/prealloc.c index a8831c1b25..5805897a4a 100644 --- a/io/prealloc.c +++ b/io/prealloc.c @@ -70,6 +70,17 @@ offset_length( return 1; } +/* + * These ioctls were withdrawn in Linux 5.17, but we'll keep them around for + * a few releases. + */ +#ifndef XFS_IOC_ALLOCSP64 +# define XFS_IOC_ALLOCSP64 _IOW ('X', 36, struct xfs_flock64) +#endif +#ifndef XFS_IOC_FREESP64 +# define XFS_IOC_FREESP64 _IOW ('X', 37, struct xfs_flock64) +#endif + static int allocsp_f( int argc, diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h index 52b48b24ff..505533c43a 100644 --- a/libxfs/xfs_fs.h +++ b/libxfs/xfs_fs.h @@ -760,13 +760,13 @@ struct xfs_scrub_metadata { * For 'documentation' purposed more than anything else, * the "cmd #" field reflects the IRIX fcntl number. */ -#define XFS_IOC_ALLOCSP _IOW ('X', 10, struct xfs_flock64) -#define XFS_IOC_FREESP _IOW ('X', 11, struct xfs_flock64) +/* XFS_IOC_ALLOCSP ------- deprecated 10 */ +/* XFS_IOC_FREESP -------- deprecated 11 */ #define XFS_IOC_DIOINFO _IOR ('X', 30, struct dioattr) #define XFS_IOC_FSGETXATTR FS_IOC_FSGETXATTR #define XFS_IOC_FSSETXATTR FS_IOC_FSSETXATTR -#define XFS_IOC_ALLOCSP64 _IOW ('X', 36, struct xfs_flock64) -#define XFS_IOC_FREESP64 _IOW ('X', 37, struct xfs_flock64) +/* XFS_IOC_ALLOCSP64 ----- deprecated 36 */ +/* XFS_IOC_FREESP64 ------ deprecated 37 */ #define XFS_IOC_GETBMAP _IOWR('X', 38, struct getbmap) /* XFS_IOC_FSSETDM ------- deprecated 39 */ #define XFS_IOC_RESVSP _IOW ('X', 40, struct xfs_flock64) diff --git a/man/man3/xfsctl.3 b/man/man3/xfsctl.3 index 43c2f4ebdf..a591e61a72 100644 --- a/man/man3/xfsctl.3 +++ b/man/man3/xfsctl.3 @@ -78,6 +78,8 @@ and .B XFS_IOC_FREESP64 operations are all identical. +These ioctls are no longer supported as of Linux 5.17. + .TP .B XFS_IOC_FSSETDM Set the di_dmevmask and di_dmstate fields in an XFS on-disk inode. diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index e3c5d3ea99..86f70ad4ca 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -396,6 +396,8 @@ manual page. and .B freesp do exactly the same thing. + +These commands are no longer supported as of Linux 5.17. .TP .BI "freesp " size " 0" See the |