Merge tag 'staging-5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

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

diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 161b0e8..4e7be6b 100644 (file)
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -966,8 +966,8 @@ xfs_growfs_rt(
         * Get the old block counts for bitmap and summary inodes.
         * These can't change since other growfs callers are locked out.
         */
-       rbmblocks = XFS_B_TO_FSB(mp, mp->m_rbmip->i_d.di_size);
-       rsumblocks = XFS_B_TO_FSB(mp, mp->m_rsumip->i_d.di_size);
+       rbmblocks = XFS_B_TO_FSB(mp, mp->m_rbmip->i_disk_size);
+       rsumblocks = XFS_B_TO_FSB(mp, mp->m_rsumip->i_disk_size);
        /*
         * Allocate space to the bitmap and summary files, as necessary.
         */
@@ -1036,9 +1036,9 @@ xfs_growfs_rt(
                 * to update the incore size so that inode inactivation won't
                 * punch what it thinks are "posteof" blocks.
                 */
-               mp->m_rbmip->i_d.di_size =
+               mp->m_rbmip->i_disk_size =
                        nsbp->sb_rbmblocks * nsbp->sb_blocksize;
-               i_size_write(VFS_I(mp->m_rbmip), mp->m_rbmip->i_d.di_size);
+               i_size_write(VFS_I(mp->m_rbmip), mp->m_rbmip->i_disk_size);
                xfs_trans_log_inode(tp, mp->m_rbmip, XFS_ILOG_CORE);
                /*
                 * Get the summary inode into the transaction.
@@ -1050,8 +1050,8 @@ xfs_growfs_rt(
                 * incore size so that inode inactivation won't punch what it
                 * thinks are "posteof" blocks.
                 */
-               mp->m_rsumip->i_d.di_size = nmp->m_rsumsize;
-               i_size_write(VFS_I(mp->m_rsumip), mp->m_rsumip->i_d.di_size);
+               mp->m_rsumip->i_disk_size = nmp->m_rsumsize;
+               i_size_write(VFS_I(mp->m_rsumip), mp->m_rsumip->i_disk_size);
                xfs_trans_log_inode(tp, mp->m_rsumip, XFS_ILOG_CORE);
                /*
                 * Copy summary data from old to new sizes.
@@ -1318,8 +1318,8 @@ xfs_rtpick_extent(
        ASSERT(xfs_isilocked(mp->m_rbmip, XFS_ILOCK_EXCL));
 
        seqp = (uint64_t *)&VFS_I(mp->m_rbmip)->i_atime;
-       if (!(mp->m_rbmip->i_d.di_flags & XFS_DIFLAG_NEWRTBM)) {
-               mp->m_rbmip->i_d.di_flags |= XFS_DIFLAG_NEWRTBM;
+       if (!(mp->m_rbmip->i_diflags & XFS_DIFLAG_NEWRTBM)) {
+               mp->m_rbmip->i_diflags |= XFS_DIFLAG_NEWRTBM;
                *seqp = 0;
        }
        seq = *seqp;