summaryrefslogtreecommitdiff
path: root/fs/btrfs/extent-tree.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-02-26 17:38:33 +0300
committerDavid Sterba <dsterba@suse.com>2016-02-26 17:38:33 +0300
commitf004fae0cfeb96d33240eb5471f14cb6fbbd4eea (patch)
tree8a0cc3be4e031298ef1f6db573c5f57da333737e /fs/btrfs/extent-tree.c
parent675d276b322b45e7bf7c616a2847bdc425745b99 (diff)
parentf827ba9a641b481f01d1bdc0771a7afc3776cc0b (diff)
downloadlinux-f004fae0cfeb96d33240eb5471f14cb6fbbd4eea.tar.xz
Merge branch 'cleanups-4.6' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r--fs/btrfs/extent-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index aa31fe97c47a..083783b53536 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -7024,7 +7024,7 @@ btrfs_lock_cluster(struct btrfs_block_group_cache *block_group,
struct btrfs_free_cluster *cluster,
int delalloc)
{
- struct btrfs_block_group_cache *used_bg;
+ struct btrfs_block_group_cache *used_bg = NULL;
bool locked = false;
again:
spin_lock(&cluster->refill_lock);