From 596ed21243aac8662e6d25bdd6935f1da5bdae91 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Wed, 19 Oct 2011 10:31:37 -0400
Subject: [PATCH] --- yaml --- r: 274655 b: refs/heads/master c:
 016fc6a63e465d5b94e4028f6d05d9703e195428 h: refs/heads/master i:   274653:
 e40e2e501a54e632979f1745e26a98ced6bdcbf8   274651:
 2565a723f3e9612424bdaa38bdc9c03fc72bbd50   274647:
 02519d47e5982403f0a70b6e2c469c74ff7a769b   274639:
 7a43423b45f866dc5291ea42ab5b6f424e408418   274623:
 cc2ada45bf4e9c5bfa3263c2ecbff36f27cd5067 v: v3

---
 [refs]                            | 2 +-
 trunk/fs/btrfs/free-space-cache.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a26cf2454841..fe3018506963 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e355b83efa80e5f5821591c13c17649594d82ac
+refs/heads/master: 016fc6a63e465d5b94e4028f6d05d9703e195428
diff --git a/trunk/fs/btrfs/free-space-cache.c b/trunk/fs/btrfs/free-space-cache.c
index 2fecfc3183ee..de205d59b74b 100644
--- a/trunk/fs/btrfs/free-space-cache.c
+++ b/trunk/fs/btrfs/free-space-cache.c
@@ -829,10 +829,6 @@ int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode,
 	if (!i_size_read(inode))
 		return -1;
 
-	filemap_write_and_wait(inode->i_mapping);
-	btrfs_wait_ordered_range(inode, inode->i_size &
-				 ~(root->sectorsize - 1), (u64)-1);
-
 	io_ctl_init(&io_ctl, inode, root);
 
 	/* Get the cluster for this block_group if it exists */