renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

xfs: remove various bulk request typedef usage

Browse Source 
Remove xfs_bstat_t, xfs_fsop_bulkreq_t, xfs_inogrp_t, and similarly
named compat typedefs.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
This commit is contained in:
Darrick J. Wong 2019-07-03 20:36:25 -07:00
parent a7a9250e18
commit 6f71fb6838
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/xfs/libxfs/xfs_fs.h
View File

@ -97,7 +97,7 @@ struct getbmapx {
* For use by backup and restore programs to set the XFS on-disk inode * 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 * fields di_dmevmask and di_dmstate. These must be set to exactly and
* only values previously obtained via xfs_bulkstat! (Specifically the * only values previously obtained via xfs_bulkstat! (Specifically the
* xfs_bstat_t fields bs_dmevmask and bs_dmstate.) * struct xfs_bstat fields bs_dmevmask and bs_dmstate.)
*/ */
#ifndef HAVE_FSDMIDATA #ifndef HAVE_FSDMIDATA
struct fsdmidata { struct fsdmidata {
@ -328,7 +328,7 @@ typedef struct xfs_bstime {
__s32 tv_nsec; /* and nanoseconds */ __s32 tv_nsec; /* and nanoseconds */
} xfs_bstime_t; } xfs_bstime_t;
typedef struct xfs_bstat { struct xfs_bstat {
__u64 bs_ino; /* inode number */ __u64 bs_ino; /* inode number */
__u16 bs_mode; /* type and mode */ __u16 bs_mode; /* type and mode */
__u16 bs_nlink; /* number of links */ __u16 bs_nlink; /* number of links */
@ -356,7 +356,7 @@ typedef struct xfs_bstat {
__u32 bs_dmevmask; /* DMIG event mask */ __u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */ __u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */ __u16 bs_aextents; /* attribute number of extents */
} xfs_bstat_t; };
/* bs_sick flags */ /* bs_sick flags */
#define XFS_BS_SICK_INODE (1 << 0) /* inode core */ #define XFS_BS_SICK_INODE (1 << 0) /* inode core */
@ -382,22 +382,22 @@ bstat_get_projid(struct xfs_bstat *bs)
/* /*
* The user-level BulkStat Request interface structure. * The user-level BulkStat Request interface structure.
*/ */
typedef struct xfs_fsop_bulkreq { struct xfs_fsop_bulkreq {
__u64 __user *lastip; /* last inode # pointer */ __u64 __user *lastip; /* last inode # pointer */
__s32 icount; /* count of entries in buffer */ __s32 icount; /* count of entries in buffer */
void __user *ubuffer;/* user buffer for inode desc. */ void __user *ubuffer;/* user buffer for inode desc. */
__s32 __user *ocount; /* output count pointer */ __s32 __user *ocount; /* output count pointer */
} xfs_fsop_bulkreq_t; };
/* /*
* Structures returned from xfs_inumbers routine (XFS_IOC_FSINUMBERS). * Structures returned from xfs_inumbers routine (XFS_IOC_FSINUMBERS).
*/ */
typedef struct xfs_inogrp { struct xfs_inogrp {
__u64 xi_startino; /* starting inode number */ __u64 xi_startino; /* starting inode number */
__s32 xi_alloccount; /* # bits set in allocmask */ __s32 xi_alloccount; /* # bits set in allocmask */
__u64 xi_allocmask; /* mask of allocated inodes */ __u64 xi_allocmask; /* mask of allocated inodes */
} xfs_inogrp_t; };
/* /*
@ -529,7 +529,7 @@ typedef struct xfs_swapext
xfs_off_t sx_offset; /* offset into file */ xfs_off_t sx_offset; /* offset into file */
xfs_off_t sx_length; /* leng from offset */ xfs_off_t sx_length; /* leng from offset */
char sx_pad[16]; /* pad space, unused */ char sx_pad[16]; /* pad space, unused */
xfs_bstat_t sx_stat; /* stat of target b4 copy */ struct xfs_bstat sx_stat; /* stat of target b4 copy */
} xfs_swapext_t; } xfs_swapext_t;
/* /*

2
fs/xfs/xfs_ioctl.c
View File

@ -757,7 +757,7 @@ xfs_ioc_bulkstat(
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return -EIO; return -EIO;
if (copy_from_user(&bulkreq, arg, sizeof(xfs_fsop_bulkreq_t))) if (copy_from_user(&bulkreq, arg, sizeof(struct xfs_fsop_bulkreq)))
return -EFAULT; return -EFAULT;
if (copy_from_user(&lastino, bulkreq.lastip, sizeof(__s64))) if (copy_from_user(&lastino, bulkreq.lastip, sizeof(__s64)))

11
fs/xfs/xfs_ioctl32.c
View File

@ -112,11 +112,14 @@ xfs_ioctl32_bstime_copyin(
return 0; return 0;
} }
/* xfs_bstat_t has differing alignment on intel, & bstime_t sizes everywhere */ /*
* struct xfs_bstat has differing alignment on intel, & bstime_t sizes
* everywhere
*/
STATIC int STATIC int
xfs_ioctl32_bstat_copyin( xfs_ioctl32_bstat_copyin(
xfs_bstat_t *bstat, struct xfs_bstat *bstat,
compat_xfs_bstat_t __user *bstat32) struct compat_xfs_bstat __user *bstat32)
{ {
if (get_user(bstat->bs_ino, &bstat32->bs_ino) || if (get_user(bstat->bs_ino, &bstat32->bs_ino) ||
get_user(bstat->bs_mode, &bstat32->bs_mode) || get_user(bstat->bs_mode, &bstat32->bs_mode) ||
@ -200,7 +203,7 @@ STATIC int
xfs_compat_ioc_bulkstat( xfs_compat_ioc_bulkstat(
xfs_mount_t *mp, xfs_mount_t *mp,
unsigned int cmd, unsigned int cmd,
compat_xfs_fsop_bulkreq_t __user *p32) struct compat_xfs_fsop_bulkreq __user *p32)
{ {
u32 addr; u32 addr;
struct xfs_fsop_bulkreq bulkreq; struct xfs_fsop_bulkreq bulkreq;

14
fs/xfs/xfs_ioctl32.h
View File

@ -36,7 +36,7 @@ typedef struct compat_xfs_bstime {
__s32 tv_nsec; /* and nanoseconds */ __s32 tv_nsec; /* and nanoseconds */
} compat_xfs_bstime_t; } compat_xfs_bstime_t;
typedef struct compat_xfs_bstat { struct compat_xfs_bstat {
__u64 bs_ino; /* inode number */ __u64 bs_ino; /* inode number */
__u16 bs_mode; /* type and mode */ __u16 bs_mode; /* type and mode */
__u16 bs_nlink; /* number of links */ __u16 bs_nlink; /* number of links */
@ -61,14 +61,14 @@ typedef struct compat_xfs_bstat {
__u32 bs_dmevmask; /* DMIG event mask */ __u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */ __u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */ __u16 bs_aextents; /* attribute number of extents */
} __compat_packed compat_xfs_bstat_t; } __compat_packed;
typedef struct compat_xfs_fsop_bulkreq { struct compat_xfs_fsop_bulkreq {
compat_uptr_t lastip; /* last inode # pointer */ compat_uptr_t lastip; /* last inode # pointer */
__s32 icount; /* count of entries in buffer */ __s32 icount; /* count of entries in buffer */
compat_uptr_t ubuffer; /* user buffer for inode desc. */ compat_uptr_t ubuffer; /* user buffer for inode desc. */
compat_uptr_t ocount; /* output count pointer */ compat_uptr_t ocount; /* output count pointer */
} compat_xfs_fsop_bulkreq_t; };
#define XFS_IOC_FSBULKSTAT_32 \ #define XFS_IOC_FSBULKSTAT_32 \
_IOWR('X', 101, struct compat_xfs_fsop_bulkreq) _IOWR('X', 101, struct compat_xfs_fsop_bulkreq)
@ -106,7 +106,7 @@ typedef struct compat_xfs_swapext {
xfs_off_t sx_offset; /* offset into file */ xfs_off_t sx_offset; /* offset into file */
xfs_off_t sx_length; /* leng from offset */ xfs_off_t sx_length; /* leng from offset */
char sx_pad[16]; /* pad space, unused */ char sx_pad[16]; /* pad space, unused */
compat_xfs_bstat_t sx_stat; /* stat of target b4 copy */ struct compat_xfs_bstat sx_stat; /* stat of target b4 copy */
} __compat_packed compat_xfs_swapext_t; } __compat_packed compat_xfs_swapext_t;
#define XFS_IOC_SWAPEXT_32 _IOWR('X', 109, struct compat_xfs_swapext) #define XFS_IOC_SWAPEXT_32 _IOWR('X', 109, struct compat_xfs_swapext)
@ -201,11 +201,11 @@ typedef struct compat_xfs_fsop_geom_v1 {
#define XFS_IOC_FSGEOMETRY_V1_32 \ #define XFS_IOC_FSGEOMETRY_V1_32 \
_IOR('X', 100, struct compat_xfs_fsop_geom_v1) _IOR('X', 100, struct compat_xfs_fsop_geom_v1)
typedef struct compat_xfs_inogrp { struct compat_xfs_inogrp {
__u64 xi_startino; /* starting inode number */ __u64 xi_startino; /* starting inode number */
__s32 xi_alloccount; /* # bits set in allocmask */ __s32 xi_alloccount; /* # bits set in allocmask */
__u64 xi_allocmask; /* mask of allocated inodes */ __u64 xi_allocmask; /* mask of allocated inodes */
} __attribute__((packed)) compat_xfs_inogrp_t; } __attribute__((packed));
/* These growfs input structures have padding on the end, so must translate */ /* These growfs input structures have padding on the end, so must translate */
typedef struct compat_xfs_growfs_data { typedef struct compat_xfs_growfs_data {