Revert "zygo: apply experimental patch from https://friendpaste.com/2CoVQ3OuxrFIPF6Eg...

This reverts commit 3a4893e39751b8e1a15ce8a739b27b5ac6767f54.

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index ddf3d81fddc3beac0ff5ed4b5d6ae81da9db84e0..8bb013672aee061e81eb03fcba6d51db9cd169af 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -43,7 +43,6 @@
 #include <linux/blkdev.h>
 #include <linux/posix_acl_xattr.h>
 #include <linux/uio.h>
-#include <linux/delay.h>
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
@@ -4991,25 +4990,12 @@ static void evict_inode_truncate_pages(struct inode *inode)
        while (!RB_EMPTY_ROOT(&io_tree->state)) {
                struct extent_state *state;
                struct extent_state *cached_state = NULL;
-               int try_ret;
-               int retry = 0;
 
                node = rb_first(&io_tree->state);
                state = rb_entry(node, struct extent_state, rb_node);
                atomic_inc(&state->refs);
                spin_unlock(&io_tree->lock);
 
-               try_ret = try_lock_extent(io_tree, state->start, state->end);
-               while (!try_ret) {
-                       printk(KERN_ERR "HERE evict inode %llu root %llu range [%llu %llu], state %u, refs %d, retry %d\n",
-                              btrfs_ino(inode), BTRFS_I(inode)->root->root_key.objectid, state->start, state->end, state->state,
-                              atomic_read(&state->refs), retry);
-                       /* msleep(1); */
-                       retry++;
-                       try_ret = try_lock_extent(io_tree, state->start, state->end);
-               }
-               unlock_extent(io_tree, state->start, state->end);
-
                lock_extent_bits(io_tree, state->start, state->end,
                                 0, &cached_state);
                clear_extent_bit(io_tree, state->start, state->end,