Merge tag 'kvm-ppc-fixes-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master

PPC KVM fixes for 5.2

- Several bug fixes for the new XIVE-native code.
- Replace kvm->lock by other mutexes in several places where we hold a
  vcpu mutex, to avoid lock order inversions.
- Fix a lockdep warning on guest entry for radix-mode guests.
- Fix a bug causing user-visible corruption of SPRG3 on the host.

1 files changed, 9 insertions, 0 deletions

diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c
index 1080381ff243..bc2dfacd2f4a 100644
--- a/fs/xfs/libxfs/xfs_ialloc_btree.c
+++ b/fs/xfs/libxfs/xfs_ialloc_btree.c
@@ -549,6 +549,15 @@ xfs_inobt_max_size(
         if (mp->m_inobt_mxr[0] == 0)
                 return 0;
 
+        /*
+         * The log is permanently allocated, so the space it occupies will
+         * never be available for the kinds of things that would require btree
+         * expansion.  We therefore can pretend the space isn't there.
+         */
+        if (mp->m_sb.sb_logstart &&
+            XFS_FSB_TO_AGNO(mp, mp->m_sb.sb_logstart) == agno)
+                agblocks -= mp->m_sb.sb_logblocks;
+
         return xfs_btree_calc_size(mp->m_inobt_mnr,
                                 (uint64_t)agblocks * mp->m_sb.sb_inopblock /
                                         XFS_INODES_PER_CHUNK);