Merge remote-tracking branch 'torvalds/master' into perf/core

[sfrench/cifs-2.6.git] / fs / xfs / xfs_extent_busy.c

diff --git a/fs/xfs/xfs_extent_busy.c b/fs/xfs/xfs_extent_busy.c
index 3991e59cfd18b7496367be341ac1d03fe0ead60a..ef17c1f6db32242bfbafc5e5f36fbfe661f306fc 100644 (file)
--- a/fs/xfs/xfs_extent_busy.c
+++ b/fs/xfs/xfs_extent_busy.c
@@ -344,7 +344,6 @@ xfs_extent_busy_trim(
        ASSERT(*len > 0);
 
        spin_lock(&args->pag->pagb_lock);
-restart:
        fbno = *bno;
        flen = *len;
        rbp = args->pag->pagb_tree.rb_node;
@@ -363,19 +362,6 @@ restart:
                        continue;
                }
 
-               /*
-                * If this is a metadata allocation, try to reuse the busy
-                * extent instead of trimming the allocation.
-                */
-               if (!(args->datatype & XFS_ALLOC_USERDATA) &&
-                   !(busyp->flags & XFS_EXTENT_BUSY_DISCARDED)) {
-                       if (!xfs_extent_busy_update_extent(args->mp, args->pag,
-                                                         busyp, fbno, flen,
-                                                         false))
-                               goto restart;
-                       continue;
-               }
-
                if (bbno <= fbno) {
                        /* start overlap */