diff --git a/[refs] b/[refs] index 5770aa2f8bb6..c8a554e228eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ca9ee09c176a814189063c8b88f75c8f8e4ad19 +refs/heads/master: d7a029a89ef370e74b63f18b81498d90d1ee3cc1 diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c index 1aeb695078b9..dbde12881244 100644 --- a/trunk/fs/btrfs/extent-tree.c +++ b/trunk/fs/btrfs/extent-tree.c @@ -3437,8 +3437,10 @@ int btrfs_shrink_extent_tree(struct btrfs_root *root, u64 shrink_start) key.objectid, key.objectid + key.offset - 1, (unsigned int)-1, GFP_NOFS); + /* memset(shrink_block_group, 0, sizeof(*shrink_block_group)); kfree(shrink_block_group); + */ btrfs_del_item(trans, root, path); btrfs_release_path(root, path);