xfs: remove double-underscore integer types
This is a purely mechanical patch that removes the private __{u,}int{8,16,32,64}_t typedefs in favor of using the system {u,}int{8,16,32,64}_t typedefs. This is the sed script used to perform the transformation and fix the resulting whitespace and indentation errors: s/typedef\t__uint8_t/typedef __uint8_t\t/g s/typedef\t__uint/typedef __uint/g s/typedef\t__int\([0-9]*\)_t/typedef int\1_t\t/g s/__uint8_t\t/__uint8_t\t\t/g s/__uint/uint/g s/__int\([0-9]*\)_t\t/__int\1_t\t\t/g s/__int/int/g /^typedef.*int[0-9]*_t;$/d Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
@@ -443,8 +443,8 @@ xfs_attrmulti_attr_get(
|
||||
struct inode *inode,
|
||||
unsigned char *name,
|
||||
unsigned char __user *ubuf,
|
||||
__uint32_t *len,
|
||||
__uint32_t flags)
|
||||
uint32_t *len,
|
||||
uint32_t flags)
|
||||
{
|
||||
unsigned char *kbuf;
|
||||
int error = -EFAULT;
|
||||
@@ -472,8 +472,8 @@ xfs_attrmulti_attr_set(
|
||||
struct inode *inode,
|
||||
unsigned char *name,
|
||||
const unsigned char __user *ubuf,
|
||||
__uint32_t len,
|
||||
__uint32_t flags)
|
||||
uint32_t len,
|
||||
uint32_t flags)
|
||||
{
|
||||
unsigned char *kbuf;
|
||||
int error;
|
||||
@@ -498,7 +498,7 @@ int
|
||||
xfs_attrmulti_attr_remove(
|
||||
struct inode *inode,
|
||||
unsigned char *name,
|
||||
__uint32_t flags)
|
||||
uint32_t flags)
|
||||
{
|
||||
int error;
|
||||
|
||||
@@ -876,7 +876,7 @@ xfs_merge_ioc_xflags(
|
||||
|
||||
STATIC unsigned int
|
||||
xfs_di2lxflags(
|
||||
__uint16_t di_flags)
|
||||
uint16_t di_flags)
|
||||
{
|
||||
unsigned int flags = 0;
|
||||
|
||||
@@ -1287,7 +1287,7 @@ xfs_ioctl_setattr_check_projid(
|
||||
struct fsxattr *fa)
|
||||
{
|
||||
/* Disallow 32bit project ids if projid32bit feature is not enabled. */
|
||||
if (fa->fsx_projid > (__uint16_t)-1 &&
|
||||
if (fa->fsx_projid > (uint16_t)-1 &&
|
||||
!xfs_sb_version_hasprojid32bit(&ip->i_mount->m_sb))
|
||||
return -EINVAL;
|
||||
|
||||
@@ -1931,7 +1931,7 @@ xfs_file_ioctl(
|
||||
|
||||
case XFS_IOC_SET_RESBLKS: {
|
||||
xfs_fsop_resblks_t inout;
|
||||
__uint64_t in;
|
||||
uint64_t in;
|
||||
|
||||
if (!capable(CAP_SYS_ADMIN))
|
||||
return -EPERM;
|
||||
@@ -2017,12 +2017,12 @@ xfs_file_ioctl(
|
||||
}
|
||||
|
||||
case XFS_IOC_GOINGDOWN: {
|
||||
__uint32_t in;
|
||||
uint32_t in;
|
||||
|
||||
if (!capable(CAP_SYS_ADMIN))
|
||||
return -EPERM;
|
||||
|
||||
if (get_user(in, (__uint32_t __user *)arg))
|
||||
if (get_user(in, (uint32_t __user *)arg))
|
||||
return -EFAULT;
|
||||
|
||||
return xfs_fs_goingdown(mp, in);
|
||||
|
Reference in New Issue
Block a user