Merge tag 'xfs-4.13-merge-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-microblaze.git] / fs / xfs / xfs_super.c

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 97df4db..38aaacd 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -196,7 +196,7 @@ xfs_parseargs(
        int                     dsunit = 0;
        int                     dswidth = 0;
        int                     iosize = 0;
-       __uint8_t               iosizelog = 0;
+       uint8_t                 iosizelog = 0;
 
        /*
         * set up the mount name first so all the errors will refer to the
@@ -556,7 +556,7 @@ xfs_showargs(
 
        return 0;
 }
-static __uint64_t
+static uint64_t
 xfs_max_file_offset(
        unsigned int            blockshift)
 {
@@ -587,7 +587,7 @@ xfs_max_file_offset(
 # endif
 #endif
 
-       return (((__uint64_t)pagefactor) << bitshift) - 1;
+       return (((uint64_t)pagefactor) << bitshift) - 1;
 }
 
 /*
@@ -622,7 +622,7 @@ xfs_set_inode_alloc(
         * the max inode percentage.  Used only for inode32.
         */
        if (mp->m_maxicount) {
-               __uint64_t      icount;
+               uint64_t        icount;
 
                icount = sbp->sb_dblocks * sbp->sb_imax_pct;
                do_div(icount, 100);
@@ -1088,12 +1088,12 @@ xfs_fs_statfs(
        struct xfs_mount        *mp = XFS_M(dentry->d_sb);
        xfs_sb_t                *sbp = &mp->m_sb;
        struct xfs_inode        *ip = XFS_I(d_inode(dentry));
-       __uint64_t              fakeinos, id;
-       __uint64_t              icount;
-       __uint64_t              ifree;
-       __uint64_t              fdblocks;
+       uint64_t                fakeinos, id;
+       uint64_t                icount;
+       uint64_t                ifree;
+       uint64_t                fdblocks;
        xfs_extlen_t            lsize;
-       __int64_t               ffree;
+       int64_t                 ffree;
 
        statp->f_type = XFS_SB_MAGIC;
        statp->f_namelen = MAXNAMELEN - 1;
@@ -1116,7 +1116,7 @@ xfs_fs_statfs(
        statp->f_bavail = statp->f_bfree;
 
        fakeinos = statp->f_bfree << sbp->sb_inopblog;
-       statp->f_files = MIN(icount + fakeinos, (__uint64_t)XFS_MAXINUMBER);
+       statp->f_files = MIN(icount + fakeinos, (uint64_t)XFS_MAXINUMBER);
        if (mp->m_maxicount)
                statp->f_files = min_t(typeof(statp->f_files),
                                        statp->f_files,
@@ -1129,7 +1129,7 @@ xfs_fs_statfs(
 
        /* make sure statp->f_ffree does not underflow */
        ffree = statp->f_files - (icount - ifree);
-       statp->f_ffree = max_t(__int64_t, ffree, 0);
+       statp->f_ffree = max_t(int64_t, ffree, 0);
 
 
        if ((ip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
@@ -1142,7 +1142,7 @@ xfs_fs_statfs(
 STATIC void
 xfs_save_resvblks(struct xfs_mount *mp)
 {
-       __uint64_t resblks = 0;
+       uint64_t resblks = 0;
 
        mp->m_resblks_save = mp->m_resblks;
        xfs_reserve_blocks(mp, &resblks, NULL);
@@ -1151,7 +1151,7 @@ xfs_save_resvblks(struct xfs_mount *mp)
 STATIC void
 xfs_restore_resvblks(struct xfs_mount *mp)
 {
-       __uint64_t resblks;
+       uint64_t resblks;
 
        if (mp->m_resblks_save) {
                resblks = mp->m_resblks_save;