From: David Sterba <dsterba@suse.com>
Date: Fri, 26 Feb 2016 14:38:32 +0000 (+0100)
Subject: Merge branch 'foreign/liubo/replace-lockup' into for-chris-4.6
X-Git-Tag: next-20160301~107^2~1^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=675d276b322b45e7bf7c616a2847bdc425745b99;p=karo-tx-linux.git

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

675d276b322b45e7bf7c616a2847bdc425745b99
diff --cc fs/btrfs/reada.c
index bf69c008249c,fe3d4c7b6342..b892914968c1
--- a/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;