6 files changed, 10 insertions, 10 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 2e18b068841b..caa73cd8c00a 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2244,7 +2244,7 @@ int btrfs_block_rsv_add(struct btrfs_trans_handle *trans,
 int btrfs_block_rsv_check(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root,
                           struct btrfs_block_rsv *block_rsv,
-                          u64 min_reserved, int min_factor);
+                          u64 min_reserved, int min_factor, int flush);
 int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src_rsv,
                             struct btrfs_block_rsv *dst_rsv,
                             u64 num_bytes);
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index d05967e9d613..a71fcf506531 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3705,7 +3705,7 @@ int btrfs_block_rsv_add(struct btrfs_trans_handle *trans,
 int btrfs_block_rsv_check(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root,
                           struct btrfs_block_rsv *block_rsv,
-                          u64 min_reserved, int min_factor)
+                          u64 min_reserved, int min_factor, int flush)
 {
         u64 num_bytes = 0;
         int ret = -ENOSPC;
@@ -3728,7 +3728,7 @@ int btrfs_block_rsv_check(struct btrfs_trans_handle *trans,
         if (!ret)
                 return 0;
 
-        ret = reserve_metadata_bytes(trans, root, block_rsv, num_bytes, 0);
+        ret = reserve_metadata_bytes(trans, root, block_rsv, num_bytes, flush);
         if (!ret) {
                 block_rsv_add_bytes(block_rsv, num_bytes, 0);
                 return 0;
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index ecc1a4f85d20..b0122e19db6b 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -199,7 +199,7 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root,
         trans->block_rsv = root->orphan_block_rsv;
         ret = btrfs_block_rsv_check(trans, root,
                                     root->orphan_block_rsv,
-                                    0, 5);
+                                    0, 5, 0);
         if (ret)
                 return ret;
 
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8316b570db55..e40b9239660d 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3576,10 +3576,10 @@ void btrfs_evict_inode(struct inode *inode)
          * doing the truncate.
          */
         while (1) {
-                ret = btrfs_block_rsv_check(NULL, root, rsv, min_size, 0);
+                ret = btrfs_block_rsv_check(NULL, root, rsv, min_size, 0, 1);
                 if (ret) {
                         printk(KERN_WARNING "Could not get space for a "
-                               "delete, will truncate on mount\n");
+                               "delete, will truncate on mount %d\n", ret);
                         btrfs_orphan_del(NULL, inode);
                         btrfs_free_block_rsv(root, rsv);
                         goto no_delete;
@@ -6575,7 +6575,7 @@ static int btrfs_truncate(struct inode *inode)
                 btrfs_add_ordered_operation(trans, root, inode);
 
         while (1) {
-                ret = btrfs_block_rsv_check(trans, root, rsv, min_size, 0);
+                ret = btrfs_block_rsv_check(trans, root, rsv, min_size, 0, 1);
                 if (ret) {
                         /*
                          * This can only happen with the original transaction we
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index aeaed99e9cfe..fd9ac66434b0 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2042,7 +2042,7 @@ static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,
                 trans->block_rsv = rc->block_rsv;
 
                 ret = btrfs_block_rsv_check(trans, root, rc->block_rsv,
-                                            min_reserved, 0);
+                                            min_reserved, 0, 0);
                 if (ret) {
                         BUG_ON(ret != -EAGAIN);
                         ret = btrfs_commit_transaction(trans, root);
@@ -3775,7 +3775,7 @@ restart:
                 }
 
                 ret = btrfs_block_rsv_check(trans, rc->extent_root,
-                                            rc->block_rsv, 0, 5);
+                                            rc->block_rsv, 0, 5, 0);
                 if (ret < 0) {
                         if (ret != -EAGAIN) {
                                 err = ret;
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 3e20cc8c1c06..a1d8c322c1ba 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -419,7 +419,7 @@ static int should_end_transaction(struct btrfs_trans_handle *trans,
 {
         int ret;
         ret = btrfs_block_rsv_check(trans, root,
-                                    &root->fs_info->global_block_rsv, 0, 5);
+                                    &root->fs_info->global_block_rsv, 0, 5, 0);
         return ret ? 1 : 0;
 }