xfs: remove the XFS_IOC_FSSETDM definitions

Source kernel commit: 9dec0368b9640c09ef5af48214e097245e57a204

Remove the definitions for these ioctls, since the functionality (and,
weirdly, the 32-bit compat ioctl definitions) were removed from the
kernel in November 2019.

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

diff --git a/libhandle/handle.c b/libhandle/handle.c
index 27abc6b2a50c3cf64449e866b42d7d93f6c1504b..333c21909007eedcf8a3f0b0b5224c6874e4eabb 100644 (file)
--- a/libhandle/handle.c
+++ b/libhandle/handle.c
@@ -436,30 +436,15 @@ parentpaths_by_handle(
        return -1;
 }
 
+/* Deprecated in kernel */
 int
 fssetdm_by_handle(
        void            *hanp,
        size_t          hlen,
        struct fsdmidata *fsdmidata)
 {
-       int             fd;
-       char            *path;
-       xfs_fsop_setdm_handlereq_t dmhreq;
-
-       if ((fd = handle_to_fsfd(hanp, &path)) < 0)
-               return -1;
-
-       dmhreq.hreq.fd       = 0;
-       dmhreq.hreq.path     = NULL;
-       dmhreq.hreq.oflags   = O_LARGEFILE;
-       dmhreq.hreq.ihandle  = hanp;
-       dmhreq.hreq.ihandlen = hlen;
-       dmhreq.hreq.ohandle  = NULL;
-       dmhreq.hreq.ohandlen = NULL;
-
-       dmhreq.data = fsdmidata;
-
-       return xfsctl(path, fd, XFS_IOC_FSSETDM_BY_HANDLE, &dmhreq);
+       errno = EOPNOTSUPP;
+       return -1;
 }
 
 /*ARGSUSED1*/

diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
index c43877c8a279f27911aed77427ab773b2563ceef..52b48b24ff6693c8b89cc2e9016d8eb156961f23 100644 (file)
--- a/libxfs/xfs_fs.h
+++ b/libxfs/xfs_fs.h
@@ -92,21 +92,6 @@ struct getbmapx {
 #define XFS_FMR_OWN_COW                FMR_OWNER('X', 7) /* cow staging */
 #define XFS_FMR_OWN_DEFECTIVE  FMR_OWNER('X', 8) /* bad blocks */
 
-/*
- * Structure for XFS_IOC_FSSETDM.
- * For use by backup and restore programs to set the XFS on-disk inode
- * fields di_dmevmask and di_dmstate.  These must be set to exactly and
- * only values previously obtained via xfs_bulkstat!  (Specifically the
- * struct xfs_bstat fields bs_dmevmask and bs_dmstate.)
- */
-#ifndef HAVE_FSDMIDATA
-struct fsdmidata {
-       __u32           fsd_dmevmask;   /* corresponds to di_dmevmask */
-       __u16           fsd_padding;
-       __u16           fsd_dmstate;    /* corresponds to di_dmstate  */
-};
-#endif
-
 /*
  * File segment locking set data type for 64 bit access.
  * Also used for all the RESV/FREE interfaces.
@@ -562,16 +547,10 @@ typedef struct xfs_fsop_handlereq {
 
 /*
  * Compound structures for passing args through Handle Request interfaces
- * xfs_fssetdm_by_handle, xfs_attrlist_by_handle, xfs_attrmulti_by_handle
- * - ioctls: XFS_IOC_FSSETDM_BY_HANDLE, XFS_IOC_ATTRLIST_BY_HANDLE, and
- *          XFS_IOC_ATTRMULTI_BY_HANDLE
+ * xfs_attrlist_by_handle, xfs_attrmulti_by_handle
+ * - ioctls: XFS_IOC_ATTRLIST_BY_HANDLE, and XFS_IOC_ATTRMULTI_BY_HANDLE
  */
 
-typedef struct xfs_fsop_setdm_handlereq {
-       struct xfs_fsop_handlereq       hreq;   /* handle information   */
-       struct fsdmidata                __user *data;   /* DMAPI data   */
-} xfs_fsop_setdm_handlereq_t;
-
 /*
  * Flags passed in xfs_attr_multiop.am_flags for the attr ioctl interface.
  *
@@ -789,7 +768,7 @@ struct xfs_scrub_metadata {
 #define XFS_IOC_ALLOCSP64      _IOW ('X', 36, struct xfs_flock64)
 #define XFS_IOC_FREESP64       _IOW ('X', 37, struct xfs_flock64)
 #define XFS_IOC_GETBMAP                _IOWR('X', 38, struct getbmap)
-#define XFS_IOC_FSSETDM                _IOW ('X', 39, struct fsdmidata)
+/*      XFS_IOC_FSSETDM ------- deprecated 39    */
 #define XFS_IOC_RESVSP         _IOW ('X', 40, struct xfs_flock64)
 #define XFS_IOC_UNRESVSP       _IOW ('X', 41, struct xfs_flock64)
 #define XFS_IOC_RESVSP64       _IOW ('X', 42, struct xfs_flock64)
@@ -831,7 +810,7 @@ struct xfs_scrub_metadata {
 #define XFS_IOC_FREEZE              _IOWR('X', 119, int)       /* aka FIFREEZE */
 #define XFS_IOC_THAW                _IOWR('X', 120, int)       /* aka FITHAW */
 
-#define XFS_IOC_FSSETDM_BY_HANDLE    _IOW ('X', 121, struct xfs_fsop_setdm_handlereq)
+/*      XFS_IOC_FSSETDM_BY_HANDLE -- deprecated 121      */
 #define XFS_IOC_ATTRLIST_BY_HANDLE   _IOW ('X', 122, struct xfs_fsop_attrlist_handlereq)
 #define XFS_IOC_ATTRMULTI_BY_HANDLE  _IOW ('X', 123, struct xfs_fsop_attrmulti_handlereq)
 #define XFS_IOC_FSGEOMETRY_V4       _IOR ('X', 124, struct xfs_fsop_geom_v4)