]> Pileus Git - ~andy/linux/commitdiff
btrfs: Don't BUG_ON alloc_path errors in btrfs_truncate_inode_items
authorMark Fasheh <mfasheh@suse.com>
Tue, 12 Jul 2011 23:44:10 +0000 (16:44 -0700)
committerMark Fasheh <mfasheh@suse.com>
Thu, 14 Jul 2011 21:14:45 +0000 (14:14 -0700)
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>
fs/btrfs/inode.c

index 8be7d7a759ce333edb190f97daa6cdfd2755bc8e..a0faf7d7f0e0bfcc5141a1c58e6ed91747946065 100644 (file)
@@ -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;