Merge branch 'alloc_path' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh...

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/file-item.c
Simple merge

diff --cc fs/btrfs/file.c
Simple merge

diff --cc fs/btrfs/inode.c
index 586cf6a438559e996e4bc7856b4bfe5a15647330,88829993db6cd816533025af04d591fad4b92034..4360ccb191b12c2f7f2b41e085209f07951fac12
--- 1/fs/btrfs/inode.c
--- 2/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);

diff --cc fs/btrfs/tree-log.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge