1 files changed, 8 insertions, 2 deletions

diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index bc3367b8b7bb..857a53e58b94 100644
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -2042,6 +2042,7 @@ xfs_alloc_space_available(
         xfs_extlen_t            alloc_len, longest;
         xfs_extlen_t            reservation; /* blocks that are still reserved */
         int                     available;
+        xfs_extlen_t            agflcount;
 
         if (flags & XFS_ALLOC_FLAG_FREEING)
                 return true;
@@ -2054,8 +2055,13 @@ xfs_alloc_space_available(
         if (longest < alloc_len)
                 return false;
 
-        /* do we have enough free space remaining for the allocation? */
-        available = (int)(pag->pagf_freeblks + pag->pagf_flcount -
+        /*
+         * Do we have enough free space remaining for the allocation? Don't
+         * account extra agfl blocks because we are about to defer free them,
+         * making them unavailable until the current transaction commits.
+         */
+        agflcount = min_t(xfs_extlen_t, pag->pagf_flcount, min_free);
+        available = (int)(pag->pagf_freeblks + agflcount -
                           reservation - min_free - args->minleft);
         if (available < (int)max(args->total, alloc_len))
                 return false;