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

Pull xfs updates from Darrick Wong:
 "Here are the XFS changes for 4.11. We aren't introducing any major
  features in this release cycle except for this being the first merge
  window I've managed on my own. :)

  Changes since last update:

   - Various cleanups

   - Livelock fixes for eofblocks scanning

   - Improved input verification for on-disk metadata

   - Fix races in the copy on write remap mechanism

   - Fix buffer io error timeout controls

   - Streamlining of directio copy on write

   - Asynchronous discard support

   - Fix asserts when splitting delalloc reservations

   - Don't bloat bmbt when right shifting extents

   - Inode alignment fixes for 32k block sizes"

* tag 'xfs-4.11-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (39 commits)
  xfs: remove XFS_ALLOCTYPE_ANY_AG and XFS_ALLOCTYPE_START_AG
  xfs: simplify xfs_rtallocate_extent
  xfs: tune down agno asserts in the bmap code
  xfs: Use xfs_icluster_size_fsb() to calculate inode chunk alignment
  xfs: don't reserve blocks for right shift transactions
  xfs: fix len comparison in xfs_extent_busy_trim
  xfs: fix uninitialized variable in _reflink_convert_cow
  xfs: split indlen reservations fairly when under reserved
  xfs: handle indlen shortage on delalloc extent merge
  xfs: resurrect debug mode drop buffered writes mechanism
  xfs: clear delalloc and cache on buffered write failure
  xfs: don't block the log commit handler for discards
  xfs: improve busy extent sorting
  xfs: improve handling of busy extents in the low-level allocator
  xfs: don't fail xfs_extent_busy allocation
  xfs: correct null checks and error processing in xfs_initialize_perag
  xfs: update ctime and mtime on clone destinatation inodes
  xfs: allocate direct I/O COW blocks in iomap_begin
  xfs: go straight to real allocations for direct I/O COW writes
  xfs: return the converted extent in __xfs_reflink_convert_cow
  ...

1 files changed, 8 insertions, 16 deletions

diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 802bcc326d9f..c57aa7f18087 100644
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -1093,7 +1093,6 @@ xfs_rtallocate_extent(
         xfs_extlen_t    minlen,         /* minimum length to allocate */
         xfs_extlen_t    maxlen,         /* maximum length to allocate */
         xfs_extlen_t    *len,           /* out: actual length allocated */
-        xfs_alloctype_t type,           /* allocation type XFS_ALLOCTYPE... */
         int             wasdel,         /* was a delayed allocation extent */
         xfs_extlen_t    prod,           /* extent product factor */
         xfs_rtblock_t   *rtblock)       /* out: start block allocated */
@@ -1123,27 +1122,16 @@ xfs_rtallocate_extent(
                 }
         }
 
+retry:
         sumbp = NULL;
-        /*
-         * Allocate by size, or near another block, or exactly at some block.
-         */
-        switch (type) {
-        case XFS_ALLOCTYPE_ANY_AG:
+        if (bno == 0) {
                 error = xfs_rtallocate_extent_size(mp, tp, minlen, maxlen, len,
                                 &sumbp, &sb, prod, &r);
-                break;
-        case XFS_ALLOCTYPE_NEAR_BNO:
+        } else {
                 error = xfs_rtallocate_extent_near(mp, tp, bno, minlen, maxlen,
                                 len, &sumbp, &sb, prod, &r);
-                break;
-        case XFS_ALLOCTYPE_THIS_BNO:
-                error = xfs_rtallocate_extent_exact(mp, tp, bno, minlen, maxlen,
-                                len, &sumbp, &sb, prod, &r);
-                break;
-        default:
-                error = -EIO;
-                ASSERT(0);
         }
+
         if (error)
                 return error;
 
@@ -1158,7 +1146,11 @@ xfs_rtallocate_extent(
                         xfs_trans_mod_sb(tp, XFS_TRANS_SB_RES_FREXTENTS, -slen);
                 else
                         xfs_trans_mod_sb(tp, XFS_TRANS_SB_FREXTENTS, -slen);
+        } else if (prod > 1) {
+                prod = 1;
+                goto retry;
         }
+
         *rtblock = r;
         return 0;
 }