diff options
author | Mark Fasheh <mfasheh@suse.com> | 2011-07-12 19:44:10 -0400 |
---|---|---|
committer | Mark Fasheh <mfasheh@suse.com> | 2011-07-14 17:14:45 -0400 |
commit | 0eb0e19cde6f01397ef8c0e094e44beb75c62a1e (patch) | |
tree | 136b1858c5c1cf6f5eb8979d153f18248b1dbf4c /fs/btrfs | |
parent | 1e5063d093b5f024ae35bf835ca07463de2c1a1f (diff) |
btrfs: Don't BUG_ON alloc_path errors in btrfs_truncate_inode_items
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>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/inode.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8be7d7a759ce..a0faf7d7f0e0 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -3172,6 +3172,11 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, | |||
3172 | 3172 | ||
3173 | BUG_ON(new_size > 0 && min_type != BTRFS_EXTENT_DATA_KEY); | 3173 | BUG_ON(new_size > 0 && min_type != BTRFS_EXTENT_DATA_KEY); |
3174 | 3174 | ||
3175 | path = btrfs_alloc_path(); | ||
3176 | if (!path) | ||
3177 | return -ENOMEM; | ||
3178 | path->reada = -1; | ||
3179 | |||
3175 | if (root->ref_cows || root == root->fs_info->tree_root) | 3180 | if (root->ref_cows || root == root->fs_info->tree_root) |
3176 | btrfs_drop_extent_cache(inode, new_size & (~mask), (u64)-1, 0); | 3181 | btrfs_drop_extent_cache(inode, new_size & (~mask), (u64)-1, 0); |
3177 | 3182 | ||
@@ -3184,10 +3189,6 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, | |||
3184 | if (min_type == 0 && root == BTRFS_I(inode)->root) | 3189 | if (min_type == 0 && root == BTRFS_I(inode)->root) |
3185 | btrfs_kill_delayed_inode_items(inode); | 3190 | btrfs_kill_delayed_inode_items(inode); |
3186 | 3191 | ||
3187 | path = btrfs_alloc_path(); | ||
3188 | BUG_ON(!path); | ||
3189 | path->reada = -1; | ||
3190 | |||
3191 | key.objectid = ino; | 3192 | key.objectid = ino; |
3192 | key.offset = (u64)-1; | 3193 | key.offset = (u64)-1; |
3193 | key.type = (u8)-1; | 3194 | key.type = (u8)-1; |