Skip to content

Commit 9dec036

Browse files
author
Darrick J. Wong
committed
xfs: remove the XFS_IOC_FSSETDM definitions
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>
1 parent 4a9bca8 commit 9dec036

File tree

1 file changed

+4
-25
lines changed

1 file changed

+4
-25
lines changed

fs/xfs/libxfs/xfs_fs.h

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,6 @@ struct getbmapx {
9292
#define XFS_FMR_OWN_COW FMR_OWNER('X', 7) /* cow staging */
9393
#define XFS_FMR_OWN_DEFECTIVE FMR_OWNER('X', 8) /* bad blocks */
9494

95-
/*
96-
* Structure for XFS_IOC_FSSETDM.
97-
* For use by backup and restore programs to set the XFS on-disk inode
98-
* fields di_dmevmask and di_dmstate. These must be set to exactly and
99-
* only values previously obtained via xfs_bulkstat! (Specifically the
100-
* struct xfs_bstat fields bs_dmevmask and bs_dmstate.)
101-
*/
102-
#ifndef HAVE_FSDMIDATA
103-
struct fsdmidata {
104-
__u32 fsd_dmevmask; /* corresponds to di_dmevmask */
105-
__u16 fsd_padding;
106-
__u16 fsd_dmstate; /* corresponds to di_dmstate */
107-
};
108-
#endif
109-
11095
/*
11196
* File segment locking set data type for 64 bit access.
11297
* Also used for all the RESV/FREE interfaces.
@@ -562,16 +547,10 @@ typedef struct xfs_fsop_handlereq {
562547

563548
/*
564549
* Compound structures for passing args through Handle Request interfaces
565-
* xfs_fssetdm_by_handle, xfs_attrlist_by_handle, xfs_attrmulti_by_handle
566-
* - ioctls: XFS_IOC_FSSETDM_BY_HANDLE, XFS_IOC_ATTRLIST_BY_HANDLE, and
567-
* XFS_IOC_ATTRMULTI_BY_HANDLE
550+
* xfs_attrlist_by_handle, xfs_attrmulti_by_handle
551+
* - ioctls: XFS_IOC_ATTRLIST_BY_HANDLE, and XFS_IOC_ATTRMULTI_BY_HANDLE
568552
*/
569553

570-
typedef struct xfs_fsop_setdm_handlereq {
571-
struct xfs_fsop_handlereq hreq; /* handle information */
572-
struct fsdmidata __user *data; /* DMAPI data */
573-
} xfs_fsop_setdm_handlereq_t;
574-
575554
/*
576555
* Flags passed in xfs_attr_multiop.am_flags for the attr ioctl interface.
577556
*
@@ -789,7 +768,7 @@ struct xfs_scrub_metadata {
789768
#define XFS_IOC_ALLOCSP64 _IOW ('X', 36, struct xfs_flock64)
790769
#define XFS_IOC_FREESP64 _IOW ('X', 37, struct xfs_flock64)
791770
#define XFS_IOC_GETBMAP _IOWR('X', 38, struct getbmap)
792-
#define XFS_IOC_FSSETDM _IOW ('X', 39, struct fsdmidata)
771+
/* XFS_IOC_FSSETDM ------- deprecated 39 */
793772
#define XFS_IOC_RESVSP _IOW ('X', 40, struct xfs_flock64)
794773
#define XFS_IOC_UNRESVSP _IOW ('X', 41, struct xfs_flock64)
795774
#define XFS_IOC_RESVSP64 _IOW ('X', 42, struct xfs_flock64)
@@ -831,7 +810,7 @@ struct xfs_scrub_metadata {
831810
#define XFS_IOC_FREEZE _IOWR('X', 119, int) /* aka FIFREEZE */
832811
#define XFS_IOC_THAW _IOWR('X', 120, int) /* aka FITHAW */
833812

834-
#define XFS_IOC_FSSETDM_BY_HANDLE _IOW ('X', 121, struct xfs_fsop_setdm_handlereq)
813+
/* XFS_IOC_FSSETDM_BY_HANDLE -- deprecated 121 */
835814
#define XFS_IOC_ATTRLIST_BY_HANDLE _IOW ('X', 122, struct xfs_fsop_attrlist_handlereq)
836815
#define XFS_IOC_ATTRMULTI_BY_HANDLE _IOW ('X', 123, struct xfs_fsop_attrmulti_handlereq)
837816
#define XFS_IOC_FSGEOMETRY_V4 _IOR ('X', 124, struct xfs_fsop_geom_v4)

0 commit comments

Comments
 (0)