Skip to content

Commit

Permalink
btrfs: Don't BUG_ON alloc_path errors in btrfs_truncate_inode_items
Browse files Browse the repository at this point in the history
I moved the path allocation up a few lines to the top of the function so
that we couldn't get into the state where we've dropped delayed items and
the extent cache but fail due to -ENOMEM.

Signed-off-by: Mark Fasheh <mfasheh@suse.com>
  • Loading branch information
Mark Fasheh committed Jul 14, 2011
1 parent 1e5063d commit 0eb0e19
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions fs/btrfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -3172,6 +3172,11 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,

BUG_ON(new_size > 0 && min_type != BTRFS_EXTENT_DATA_KEY);

path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
path->reada = -1;

if (root->ref_cows || root == root->fs_info->tree_root)
btrfs_drop_extent_cache(inode, new_size & (~mask), (u64)-1, 0);

Expand All @@ -3184,10 +3189,6 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
if (min_type == 0 && root == BTRFS_I(inode)->root)
btrfs_kill_delayed_inode_items(inode);

path = btrfs_alloc_path();
BUG_ON(!path);
path->reada = -1;

key.objectid = ino;
key.offset = (u64)-1;
key.type = (u8)-1;
Expand Down

0 comments on commit 0eb0e19

Please sign in to comment.