From: Mark Fasheh <mfasheh@suse.com>
Date: Tue, 12 Jul 2011 23:44:10 +0000 (-0700)
Subject: btrfs: Don't BUG_ON alloc_path errors in btrfs_truncate_inode_items
X-Git-Tag: firefly_0821_release~3680^2~4365^2~55^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0eb0e19cde6f01397ef8c0e094e44beb75c62a1e;p=firefly-linux-kernel-4.4.55.git

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>
---

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,
 
 	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);
 
@@ -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;