From de206214a63f7b3d47376407aaf115a656c8b22f Mon Sep 17 00:00:00 2001
From: Josef Bacik <jbacik@fusionio.com>
Date: Wed, 8 Aug 2012 10:12:59 -0600
Subject: [PATCH] --- yaml --- r: 322367 b: refs/heads/master c:
 5a24e84c55f57cc49bd1cab531b6ef28b6b7bdaa h: refs/heads/master i:   322365:
 4366de2232321a6f1f5d7bd1197f93a71fff0acf   322363:
 3595d79c63e0d459342cd6714c025b5fbd78f662   322359:
 a5661289f69b8bf883d98ab3ad533bb353194413   322351:
 7a4725e6a9bd6daade16be41d428ee3d6d32d75c   322335:
 d4c0110f4fbf0b4513c0dca1f8856a0d111002bf   322303:
 4cea2335f8be42e6396631b2f6f32b43aa2afd83 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a07824584a05..fdbb84e26d7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0f62dedd04ae0f3b8a18079db5a015af24e416f
+refs/heads/master: 5a24e84c55f57cc49bd1cab531b6ef28b6b7bdaa
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 97baf00b40d1..0808f483dafa 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -3171,7 +3171,7 @@ int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,
 	btrfs_i_size_write(dir, dir->i_size - name_len * 2);
 	inode_inc_iversion(dir);
 	dir->i_mtime = dir->i_ctime = CURRENT_TIME;
-	ret = btrfs_update_inode(trans, root, dir);
+	ret = btrfs_update_inode_fallback(trans, root, dir);
 	if (ret)
 		btrfs_abort_transaction(trans, root, ret);
 out: