[055/111] Btrfs: dont add extent 0 to the free space cache v2
in [Kernel]
|
Prev: [048/111] Btrfs: Avoid orphan inodes cleanup during committing transaction
Next: [053/111] Btrfs: Fix btrfs_drop_extent_cache for skip pinned case
From: Greg KH on 11 Aug 2010 20:40 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ From: Yan, Zheng <zheng.yan(a)oracle.com> commit 06b2331f8333ec6edf41662757ce8882cc1747d5 upstream. If block group 0 is completely free, btrfs_read_block_groups will add extent [0, BTRFS_SUPER_INFO_OFFSET) to the free space cache. Signed-off-by: Yan Zheng <zheng.yan(a)oracle.com> Signed-off-by: Chris Mason <chris.mason(a)oracle.com> Acked-by: Jeff Mahoney <jeffm(a)suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- fs/btrfs/extent-tree.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -195,6 +195,14 @@ static int exclude_super_stripes(struct int stripe_len; int i, nr, ret; + if (cache->key.objectid < BTRFS_SUPER_INFO_OFFSET) { + stripe_len = BTRFS_SUPER_INFO_OFFSET - cache->key.objectid; + cache->bytes_super += stripe_len; + ret = add_excluded_extent(root, cache->key.objectid, + stripe_len); + BUG_ON(ret); + } + for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) { bytenr = btrfs_sb_offset(i); ret = btrfs_rmap_block(&root->fs_info->mapping_tree, @@ -255,7 +263,7 @@ static u64 add_new_free_space(struct btr if (ret) break; - if (extent_start == start) { + if (extent_start <= start) { start = extent_end + 1; } else if (extent_start > start && extent_start < end) { size = extent_start - start; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |