hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/fs/xfs/xfs_ioctl32.h
....@@ -32,11 +32,11 @@
3232 #endif
3333
3434 typedef struct compat_xfs_bstime {
35
- compat_time_t tv_sec; /* seconds */
35
+ old_time32_t tv_sec; /* seconds */
3636 __s32 tv_nsec; /* and nanoseconds */
3737 } compat_xfs_bstime_t;
3838
39
-typedef struct compat_xfs_bstat {
39
+struct compat_xfs_bstat {
4040 __u64 bs_ino; /* inode number */
4141 __u16 bs_mode; /* type and mode */
4242 __u16 bs_nlink; /* number of links */
....@@ -61,14 +61,14 @@
6161 __u32 bs_dmevmask; /* DMIG event mask */
6262 __u16 bs_dmstate; /* DMIG state info */
6363 __u16 bs_aextents; /* attribute number of extents */
64
-} __compat_packed compat_xfs_bstat_t;
64
+} __compat_packed;
6565
66
-typedef struct compat_xfs_fsop_bulkreq {
66
+struct compat_xfs_fsop_bulkreq {
6767 compat_uptr_t lastip; /* last inode # pointer */
6868 __s32 icount; /* count of entries in buffer */
6969 compat_uptr_t ubuffer; /* user buffer for inode desc. */
7070 compat_uptr_t ocount; /* output count pointer */
71
-} compat_xfs_fsop_bulkreq_t;
71
+};
7272
7373 #define XFS_IOC_FSBULKSTAT_32 \
7474 _IOWR('X', 101, struct compat_xfs_fsop_bulkreq)
....@@ -99,15 +99,15 @@
9999 _IOWR('X', 108, struct compat_xfs_fsop_handlereq)
100100
101101 /* The bstat field in the swapext struct needs translation */
102
-typedef struct compat_xfs_swapext {
102
+struct compat_xfs_swapext {
103103 int64_t sx_version; /* version */
104104 int64_t sx_fdtarget; /* fd of target file */
105105 int64_t sx_fdtmp; /* fd of tmp file */
106106 xfs_off_t sx_offset; /* offset into file */
107107 xfs_off_t sx_length; /* leng from offset */
108108 char sx_pad[16]; /* pad space, unused */
109
- compat_xfs_bstat_t sx_stat; /* stat of target b4 copy */
110
-} __compat_packed compat_xfs_swapext_t;
109
+ struct compat_xfs_bstat sx_stat; /* stat of target b4 copy */
110
+} __compat_packed;
111111
112112 #define XFS_IOC_SWAPEXT_32 _IOWR('X', 109, struct compat_xfs_swapext)
113113
....@@ -142,15 +142,6 @@
142142
143143 #define XFS_IOC_ATTRMULTI_BY_HANDLE_32 \
144144 _IOW('X', 123, struct compat_xfs_fsop_attrmulti_handlereq)
145
-
146
-typedef struct compat_xfs_fsop_setdm_handlereq {
147
- struct compat_xfs_fsop_handlereq hreq; /* handle information */
148
- /* ptr to struct fsdmidata */
149
- compat_uptr_t data; /* DMAPI data */
150
-} compat_xfs_fsop_setdm_handlereq_t;
151
-
152
-#define XFS_IOC_FSSETDM_BY_HANDLE_32 \
153
- _IOW('X', 121, struct compat_xfs_fsop_setdm_handlereq)
154145
155146 #ifdef BROKEN_X86_ALIGNMENT
156147 /* on ia32 l_start is on a 32-bit boundary */
....@@ -201,11 +192,11 @@
201192 #define XFS_IOC_FSGEOMETRY_V1_32 \
202193 _IOR('X', 100, struct compat_xfs_fsop_geom_v1)
203194
204
-typedef struct compat_xfs_inogrp {
195
+struct compat_xfs_inogrp {
205196 __u64 xi_startino; /* starting inode number */
206197 __s32 xi_alloccount; /* # bits set in allocmask */
207198 __u64 xi_allocmask; /* mask of allocated inodes */
208
-} __attribute__((packed)) compat_xfs_inogrp_t;
199
+} __attribute__((packed));
209200
210201 /* These growfs input structures have padding on the end, so must translate */
211202 typedef struct compat_xfs_growfs_data {