.. | .. |
---|
32 | 32 | #endif |
---|
33 | 33 | |
---|
34 | 34 | typedef struct compat_xfs_bstime { |
---|
35 | | - compat_time_t tv_sec; /* seconds */ |
---|
| 35 | + old_time32_t tv_sec; /* seconds */ |
---|
36 | 36 | __s32 tv_nsec; /* and nanoseconds */ |
---|
37 | 37 | } compat_xfs_bstime_t; |
---|
38 | 38 | |
---|
39 | | -typedef struct compat_xfs_bstat { |
---|
| 39 | +struct compat_xfs_bstat { |
---|
40 | 40 | __u64 bs_ino; /* inode number */ |
---|
41 | 41 | __u16 bs_mode; /* type and mode */ |
---|
42 | 42 | __u16 bs_nlink; /* number of links */ |
---|
.. | .. |
---|
61 | 61 | __u32 bs_dmevmask; /* DMIG event mask */ |
---|
62 | 62 | __u16 bs_dmstate; /* DMIG state info */ |
---|
63 | 63 | __u16 bs_aextents; /* attribute number of extents */ |
---|
64 | | -} __compat_packed compat_xfs_bstat_t; |
---|
| 64 | +} __compat_packed; |
---|
65 | 65 | |
---|
66 | | -typedef struct compat_xfs_fsop_bulkreq { |
---|
| 66 | +struct compat_xfs_fsop_bulkreq { |
---|
67 | 67 | compat_uptr_t lastip; /* last inode # pointer */ |
---|
68 | 68 | __s32 icount; /* count of entries in buffer */ |
---|
69 | 69 | compat_uptr_t ubuffer; /* user buffer for inode desc. */ |
---|
70 | 70 | compat_uptr_t ocount; /* output count pointer */ |
---|
71 | | -} compat_xfs_fsop_bulkreq_t; |
---|
| 71 | +}; |
---|
72 | 72 | |
---|
73 | 73 | #define XFS_IOC_FSBULKSTAT_32 \ |
---|
74 | 74 | _IOWR('X', 101, struct compat_xfs_fsop_bulkreq) |
---|
.. | .. |
---|
99 | 99 | _IOWR('X', 108, struct compat_xfs_fsop_handlereq) |
---|
100 | 100 | |
---|
101 | 101 | /* The bstat field in the swapext struct needs translation */ |
---|
102 | | -typedef struct compat_xfs_swapext { |
---|
| 102 | +struct compat_xfs_swapext { |
---|
103 | 103 | int64_t sx_version; /* version */ |
---|
104 | 104 | int64_t sx_fdtarget; /* fd of target file */ |
---|
105 | 105 | int64_t sx_fdtmp; /* fd of tmp file */ |
---|
106 | 106 | xfs_off_t sx_offset; /* offset into file */ |
---|
107 | 107 | xfs_off_t sx_length; /* leng from offset */ |
---|
108 | 108 | 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; |
---|
111 | 111 | |
---|
112 | 112 | #define XFS_IOC_SWAPEXT_32 _IOWR('X', 109, struct compat_xfs_swapext) |
---|
113 | 113 | |
---|
.. | .. |
---|
142 | 142 | |
---|
143 | 143 | #define XFS_IOC_ATTRMULTI_BY_HANDLE_32 \ |
---|
144 | 144 | _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) |
---|
154 | 145 | |
---|
155 | 146 | #ifdef BROKEN_X86_ALIGNMENT |
---|
156 | 147 | /* on ia32 l_start is on a 32-bit boundary */ |
---|
.. | .. |
---|
201 | 192 | #define XFS_IOC_FSGEOMETRY_V1_32 \ |
---|
202 | 193 | _IOR('X', 100, struct compat_xfs_fsop_geom_v1) |
---|
203 | 194 | |
---|
204 | | -typedef struct compat_xfs_inogrp { |
---|
| 195 | +struct compat_xfs_inogrp { |
---|
205 | 196 | __u64 xi_startino; /* starting inode number */ |
---|
206 | 197 | __s32 xi_alloccount; /* # bits set in allocmask */ |
---|
207 | 198 | __u64 xi_allocmask; /* mask of allocated inodes */ |
---|
208 | | -} __attribute__((packed)) compat_xfs_inogrp_t; |
---|
| 199 | +} __attribute__((packed)); |
---|
209 | 200 | |
---|
210 | 201 | /* These growfs input structures have padding on the end, so must translate */ |
---|
211 | 202 | typedef struct compat_xfs_growfs_data { |
---|