From 786f10711a526965c21d80fe8fcc36eabf0c958d Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 12 Apr 2012 16:03:56 -0400 Subject: [PATCH] --- yaml --- r: 299217 b: refs/heads/master c: c6664b42c4e567792abdb17c958fb01c5bcfcb3a h: refs/heads/master i: 299215: 3bedca927cbed2e8b2cdd83000945c12118c66cd v: v3 --- [refs] | 2 +- trunk/fs/btrfs/extent-tree.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 190f9433c95a..7026d287c801 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b89203f74bdfcb15407d54d3f257b16a2ea19e62 +refs/heads/master: c6664b42c4e567792abdb17c958fb01c5bcfcb3a diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c index ace5e8cef03e..a2134d8141c1 100644 --- a/trunk/fs/btrfs/extent-tree.c +++ b/trunk/fs/btrfs/extent-tree.c @@ -3152,15 +3152,14 @@ static void set_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags) /* * returns target flags in extended format or 0 if restripe for this * chunk_type is not in progress + * + * should be called with either volume_mutex or balance_lock held */ static u64 get_restripe_target(struct btrfs_fs_info *fs_info, u64 flags) { struct btrfs_balance_control *bctl = fs_info->balance_ctl; u64 target = 0; - BUG_ON(!mutex_is_locked(&fs_info->volume_mutex) && - !spin_is_locked(&fs_info->balance_lock)); - if (!bctl) return 0;