Skip to content

Commit

Permalink
Btrfs: Protect the readonly flag of block group
Browse files Browse the repository at this point in the history
The access for ro in btrfs_block_group_cache should be protected
because of the racy lock in relocation.

Signed-off-by: Wu Bo <wu.bo@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
WuBo authored and Chris Mason committed Aug 1, 2011
1 parent 1bf8504 commit 61cfea9
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions fs/btrfs/extent-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -6549,8 +6549,6 @@ static int set_block_group_ro(struct btrfs_block_group_cache *cache, int force)
u64 min_allocable_bytes;
int ret = -ENOSPC;

if (cache->ro)
return 0;

/*
* We need some metadata space and system metadata space for
Expand All @@ -6566,6 +6564,12 @@ static int set_block_group_ro(struct btrfs_block_group_cache *cache, int force)

spin_lock(&sinfo->lock);
spin_lock(&cache->lock);

if (cache->ro) {
ret = 0;
goto out;
}

num_bytes = cache->key.offset - cache->reserved - cache->pinned -
cache->bytes_super - btrfs_block_group_used(&cache->item);

Expand All @@ -6579,7 +6583,7 @@ static int set_block_group_ro(struct btrfs_block_group_cache *cache, int force)
cache->ro = 1;
ret = 0;
}

out:
spin_unlock(&cache->lock);
spin_unlock(&sinfo->lock);
return ret;
Expand Down

0 comments on commit 61cfea9

Please sign in to comment.