Merge branch 'foreign/liubo/replace-lockup' into for-chris-4.6

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/dev-replace.c
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/extent_io.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/btrfs/ioctl.c
Simple merge

diff --cc fs/btrfs/reada.c
index bf69c008249cea38d265be871e3324309d31470d,fe3d4c7b6342caa418fc761c422d2e06ecbb2011..b892914968c1852751463d9d14eb5023fbb99df7
--- 1/fs/btrfs/reada.c
--- 2/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@@ -451,17 -456,13 +451,17 @@@ static struct reada_extent *reada_find_
                        BUG_ON(fs_info == NULL);
                        radix_tree_delete(&fs_info->reada_tree, index);
                        spin_unlock(&fs_info->reada_lock);
-                       btrfs_dev_replace_unlock(&fs_info->dev_replace);
+                       btrfs_dev_replace_unlock(&fs_info->dev_replace, 0);
                        goto error;
                }
 +              have_zone = 1;
        }
        spin_unlock(&fs_info->reada_lock);
-       btrfs_dev_replace_unlock(&fs_info->dev_replace);
+       btrfs_dev_replace_unlock(&fs_info->dev_replace, 0);
  
 +      if (!have_zone)
 +              goto error;
 +
        btrfs_put_bbio(bbio);
        return re;
  

diff --cc fs/btrfs/scrub.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge