1 files changed, 7 insertions, 9 deletions

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 2234e88cf674..bcfb4a27ddd4 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1629,13 +1629,11 @@ again:
                  * managed to copy.
                  */
                 if (num_sectors > dirty_sectors) {
-                        /*
-                         * we round down because we don't want to count
-                         * any partial blocks actually sent through the
-                         * IO machines
-                         */
-                        release_bytes = round_down(release_bytes - copied,
-                                      root->sectorsize);
+
+                        /* release everything except the sectors we dirtied */
+                        release_bytes -= dirty_sectors <<
+                                root->fs_info->sb->s_blocksize_bits;
+
                         if (copied > 0) {
                                 spin_lock(&BTRFS_I(inode)->lock);
                                 BTRFS_I(inode)->outstanding_extents++;
@@ -2479,7 +2477,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
         }
 
         ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv, rsv,
-                                      min_size);
+                                      min_size, 0);
         BUG_ON(ret);
         trans->block_rsv = rsv;
 
@@ -2522,7 +2520,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
                 }
 
                 ret = btrfs_block_rsv_migrate(&root->fs_info->trans_block_rsv,
-                                              rsv, min_size);
+                                              rsv, min_size, 0);
                 BUG_ON(ret);    /* shouldn't happen */
                 trans->block_rsv = rsv;