From: Darrick J. Wong <djwong@kernel.org>
Date: Fri, 6 May 2022 19:22:35 +0000 (-0400)
Subject: xfs: remove the XFS_IOC_{ALLOC,FREE}SP* definitions
X-Git-Tag: v5.18.0-rc1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7126f90b3c1a694a4269bb1902cbbcda0e1d9100;p=thirdparty%2Fxfsprogs-dev.git

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>
---

diff --git a/io/prealloc.c b/io/prealloc.c
index a8831c1b2..5805897a4 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 52b48b24f..505533c43 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 43c2f4ebd..a591e61a7 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 e3c5d3ea9..86f70ad4c 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