diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index d6619d68553128fe123778cc3b7da372a563176f..aeb03f9a8967330faa9c83dc9e9e489c4c1594a1 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1130,7 +1130,7 @@ xfs_fs_remount(
 			mp->m_flags &= ~XFS_MOUNT_BARRIER;
 			break;
 		case Opt_inode64:
-			xfs_set_inode64(mp);
+			mp->m_maxagi = xfs_set_inode64(mp);
 			break;
 		default:
 			/*