Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 10 insertions, 1 deletions

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8b1212e8f7a8..d2be95cfb6d1 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3271,7 +3271,16 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
         /* grab metadata reservation from transaction handle */
         if (reserve) {
                 ret = btrfs_orphan_reserve_metadata(trans, inode);
-                BUG_ON(ret); /* -ENOSPC in reservation; Logic error? JDM */
+                ASSERT(!ret);
+                if (ret) {
+                        atomic_dec(&root->orphan_inodes);
+                        clear_bit(BTRFS_INODE_ORPHAN_META_RESERVED,
+                                  &BTRFS_I(inode)->runtime_flags);
+                        if (insert)
+                                clear_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
+                                          &BTRFS_I(inode)->runtime_flags);
+                        return ret;
+                }
         }
 
         /* insert an orphan item to track this unlinked/truncated file */