Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6

Resolve conflicts with the VFS atomic open and sget changes.

Conflicts:
	fs/nfs/nfs4proc.c

1 files changed, 6 insertions, 0 deletions

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 2017d0ff511c..8abeae4224f9 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -690,6 +690,8 @@ static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans,
         kfree(name);
 
         iput(inode);
+
+        btrfs_run_delayed_items(trans, root);
         return ret;
 }
 
@@ -895,6 +897,7 @@ again:
                                 ret = btrfs_unlink_inode(trans, root, dir,
                                                          inode, victim_name,
                                                          victim_name_len);
+                                btrfs_run_delayed_items(trans, root);
                         }
                         kfree(victim_name);
                         ptr = (unsigned long)(victim_ref + 1) + victim_name_len;
@@ -1475,6 +1478,9 @@ again:
                         ret = btrfs_unlink_inode(trans, root, dir, inode,
                                                  name, name_len);
                         BUG_ON(ret);
+
+                        btrfs_run_delayed_items(trans, root);
+
                         kfree(name);
                         iput(inode);