From ae081d4b4b4c321359f48a66a6116ccdf94ffd0c Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Wed, 30 Nov 2011 13:43:00 -0500 Subject: [PATCH] --- yaml --- r: 276137 b: refs/heads/master c: be064d113906f04ea13088a8260e1e68ae0a4050 h: refs/heads/master i: 276135: c71c85a9e22655577e4a7a0e40da4181cb6ebf39 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/extent-tree.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 497079365835..512ca3b19912 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 425d83156ca27f74e2cc3f370138038c3c8947f8 +refs/heads/master: be064d113906f04ea13088a8260e1e68ae0a4050 diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c index 71c8e7049d0c..813c6bb96c9a 100644 --- a/trunk/fs/btrfs/extent-tree.c +++ b/trunk/fs/btrfs/extent-tree.c @@ -5299,9 +5299,9 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans, * people trying to start a new cluster */ spin_lock(&last_ptr->refill_lock); - if (last_ptr->block_group && - (last_ptr->block_group->ro || - !block_group_bits(last_ptr->block_group, data))) + if (!last_ptr->block_group || + last_ptr->block_group->ro || + !block_group_bits(last_ptr->block_group, data)) goto refill_cluster; offset = btrfs_alloc_from_cluster(block_group, last_ptr,