From: Chris Mason <chris.mason@oracle.com>
Date: Mon, 1 Aug 2011 18:27:34 +0000 (-0400)
Subject: Merge branch 'alloc_path' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh... 
X-Git-Tag: v3.1-rc1~82^2~24
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b43b31bdf2e662006c27cc4dcccf863312d62bc1;p=linux.git

Merge branch 'alloc_path' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/btrfs-error-handling into for-linus
---

b43b31bdf2e662006c27cc4dcccf863312d62bc1
diff --cc fs/btrfs/inode.c
index 586cf6a43855,88829993db6c..4360ccb191b1
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -1061,9 -1070,10 +1061,10 @@@ static noinline int run_delalloc_nocow(
  	u64 ino = btrfs_ino(inode);
  
  	path = btrfs_alloc_path();
- 	BUG_ON(!path);
+ 	if (!path)
+ 		return -ENOMEM;
  
 -	nolock = is_free_space_inode(root, inode);
 +	nolock = btrfs_is_free_space_inode(root, inode);
  
  	if (nolock)
  		trans = btrfs_join_transaction_nolock(root);