Skip to content

L
linux-davinci
Commit e9fe395e authored by Yan's avatar Yan Committed by David Woodhouse
Browse files
Options

Btrfs: Fix oopsen in extent_tree.c during enospc 

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 4b82d6e4
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
fs/btrfs/extent-tree.c
View file @ e9fe395e
...@@ -244,7 +244,7 @@ struct btrfs_block_group_cache *btrfs_find_block_group(struct btrfs_root *root, ...@@ -244,7 +244,7 @@ struct btrfs_block_group_cache *btrfs_find_block_group(struct btrfs_root *root,
if (search_start) { if (search_start) {
struct btrfs_block_group_cache *shint; struct btrfs_block_group_cache *shint;
shint = btrfs_lookup_block_group(info, search_start); shint = btrfs_lookup_block_group(info, search_start);
if (shint->data == data) { if (shint && shint->data == data) {
used = btrfs_block_group_used(&shint->item); used = btrfs_block_group_used(&shint->item);
if (used + shint->pinned < if (used + shint->pinned <
div_factor(shint->key.offset, factor)) { div_factor(shint->key.offset, factor)) {
...@@ -1255,8 +1255,7 @@ struct buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans, ...@@ -1255,8 +1255,7 @@ struct buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
struct buffer_head *buf; struct buffer_head *buf;
ret = btrfs_alloc_extent(trans, root, root->root_key.objectid, ret = btrfs_alloc_extent(trans, root, root->root_key.objectid,
1, empty_size, hint, 1, empty_size, hint, (u64)-1, &ins, 0);
(unsigned long)-1, &ins, 0);
if (ret) { if (ret) {
BUG_ON(ret > 0); BUG_ON(ret > 0);
return ERR_PTR(ret); return ERR_PTR(ret);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment