diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2012-04-12 22:03:56 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-04-12 22:03:56 +0200 |
| commit | c6664b42c4e567792abdb17c958fb01c5bcfcb3a (patch) | |
| tree | 41a5f7e6f6507db58103ed3d96f3154e0fe04331 /fs/btrfs/extent-tree.c | |
| parent | Btrfs: fix eof while discarding extents (diff) | |
| download | linux-c6664b42c4e567792abdb17c958fb01c5bcfcb3a.tar.xz linux-c6664b42c4e567792abdb17c958fb01c5bcfcb3a.zip | |
Btrfs: remove lock assert from get_restripe_target()
This fixes a regression introduced by fc67c450. spin_is_locked() always
returns 0 on UP kernels, which caused assert in get_restripe_target() to
be fired on every call from btrfs_reduce_alloc_profile() on UP systems.
Remove it completely for now, it's not clear if it's going to be needed
in future.
Reported-by: Bobby Powers <bobbypowers@gmail.com>
Reported-by: Mitch Harder <mitch.harder@sabayonlinux.org>
Tested-by: Mitch Harder <mitch.harder@sabayonlinux.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index ace5e8cef03e..a2134d8141c1 100644 --- a/fs/btrfs/extent-tree.c +++ b/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; |