7 files changed, 20 insertions, 27 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index c1489c229694..fe2b8765d9e6 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2487,8 +2487,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
                                      int nitems, bool use_global_rsv);
 void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,
                                       struct btrfs_block_rsv *rsv);
-void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes,
-                                    bool qgroup_free);
+void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes);
 
 int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes);
 u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo);
diff --git a/fs/btrfs/delalloc-space.c b/fs/btrfs/delalloc-space.c
index d949d7d2abed..571e7b31ea2f 100644
--- a/fs/btrfs/delalloc-space.c
+++ b/fs/btrfs/delalloc-space.c
@@ -418,7 +418,6 @@ void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes,
  * btrfs_delalloc_release_extents - release our outstanding_extents
  * @inode: the inode to balance the reservation for.
  * @num_bytes: the number of bytes we originally reserved with
- * @qgroup_free: do we need to free qgroup meta reservation or convert them.
  *
  * When we reserve space we increase outstanding_extents for the extents we may
  * add.  Once we've set the range as delalloc or created our ordered extents we
@@ -426,8 +425,7 @@ void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes,
  * temporarily tracked outstanding_extents.  This _must_ be used in conjunction
  * with btrfs_delalloc_reserve_metadata.
  */
-void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes,
-                                    bool qgroup_free)
+void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes)
 {
         struct btrfs_fs_info *fs_info = inode->root->fs_info;
         unsigned num_extents;
@@ -441,7 +439,7 @@ void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes,
         if (btrfs_is_testing(fs_info))
                 return;
 
-        btrfs_inode_rsv_release(inode, qgroup_free);
+        btrfs_inode_rsv_release(inode, true);
 }
 
 /**
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 27e5b269e729..e955e7fa9201 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1692,7 +1692,7 @@ again:
                                     force_page_uptodate);
                 if (ret) {
                         btrfs_delalloc_release_extents(BTRFS_I(inode),
-                                                       reserve_bytes, true);
+                                                       reserve_bytes);
                         break;
                 }
 
@@ -1704,7 +1704,7 @@ again:
                         if (extents_locked == -EAGAIN)
                                 goto again;
                         btrfs_delalloc_release_extents(BTRFS_I(inode),
-                                                       reserve_bytes, true);
+                                                       reserve_bytes);
                         ret = extents_locked;
                         break;
                 }
@@ -1772,8 +1772,7 @@ again:
                 else
                         free_extent_state(cached_state);
 
-                btrfs_delalloc_release_extents(BTRFS_I(inode), reserve_bytes,
-                                               true);
+                btrfs_delalloc_release_extents(BTRFS_I(inode), reserve_bytes);
                 if (ret) {
                         btrfs_drop_pages(pages, num_pages);
                         break;
diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index 63cad7865d75..37345fb6191d 100644
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -501,13 +501,13 @@ again:
         ret = btrfs_prealloc_file_range_trans(inode, trans, 0, 0, prealloc,
                                               prealloc, prealloc, &alloc_hint);
         if (ret) {
-                btrfs_delalloc_release_extents(BTRFS_I(inode), prealloc, true);
+                btrfs_delalloc_release_extents(BTRFS_I(inode), prealloc);
                 btrfs_delalloc_release_metadata(BTRFS_I(inode), prealloc, true);
                 goto out_put;
         }
 
         ret = btrfs_write_out_ino_cache(root, trans, path, inode);
-        btrfs_delalloc_release_extents(BTRFS_I(inode), prealloc, false);
+        btrfs_delalloc_release_extents(BTRFS_I(inode), prealloc);
 out_put:
         iput(inode);
 out_release:
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0f2754eaa05b..c3f386b7cc0b 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2206,7 +2206,7 @@ again:
 
         ClearPageChecked(page);
         set_page_dirty(page);
-        btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE, false);
+        btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);
 out:
         unlock_extent_cached(&BTRFS_I(inode)->io_tree, page_start, page_end,
                              &cached_state);
@@ -4951,7 +4951,7 @@ again:
         if (!page) {
                 btrfs_delalloc_release_space(inode, data_reserved,
                                              block_start, blocksize, true);
-                btrfs_delalloc_release_extents(BTRFS_I(inode), blocksize, true);
+                btrfs_delalloc_release_extents(BTRFS_I(inode), blocksize);
                 ret = -ENOMEM;
                 goto out;
         }
@@ -5018,7 +5018,7 @@ out_unlock:
         if (ret)
                 btrfs_delalloc_release_space(inode, data_reserved, block_start,
                                              blocksize, true);
-        btrfs_delalloc_release_extents(BTRFS_I(inode), blocksize, (ret != 0));
+        btrfs_delalloc_release_extents(BTRFS_I(inode), blocksize);
         unlock_page(page);
         put_page(page);
 out:
@@ -8709,7 +8709,7 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
                 } else if (ret >= 0 && (size_t)ret < count)
                         btrfs_delalloc_release_space(inode, data_reserved,
                                         offset, count - (size_t)ret, true);
-                btrfs_delalloc_release_extents(BTRFS_I(inode), count, false);
+                btrfs_delalloc_release_extents(BTRFS_I(inode), count);
         }
 out:
         if (wakeup)
@@ -9059,7 +9059,7 @@ again:
         unlock_extent_cached(io_tree, page_start, page_end, &cached_state);
 
         if (!ret2) {
-                btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE, true);
+                btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);
                 sb_end_pagefault(inode->i_sb);
                 extent_changeset_free(data_reserved);
                 return VM_FAULT_LOCKED;
@@ -9068,7 +9068,7 @@ again:
 out_unlock:
         unlock_page(page);
 out:
-        btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE, (ret != 0));
+        btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);
         btrfs_delalloc_release_space(inode, data_reserved, page_start,
                                      reserved_space, (ret != 0));
 out_noreserve:
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index de730e56d3f5..7c145a41decd 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1360,8 +1360,7 @@ again:
                 unlock_page(pages[i]);
                 put_page(pages[i]);
         }
-        btrfs_delalloc_release_extents(BTRFS_I(inode), page_cnt << PAGE_SHIFT,
-                                       false);
+        btrfs_delalloc_release_extents(BTRFS_I(inode), page_cnt << PAGE_SHIFT);
         extent_changeset_free(data_reserved);
         return i_done;
 out:
@@ -1372,8 +1371,7 @@ out:
         btrfs_delalloc_release_space(inode, data_reserved,
                         start_index << PAGE_SHIFT,
                         page_cnt << PAGE_SHIFT, true);
-        btrfs_delalloc_release_extents(BTRFS_I(inode), page_cnt << PAGE_SHIFT,
-                                       true);
+        btrfs_delalloc_release_extents(BTRFS_I(inode), page_cnt << PAGE_SHIFT);
         extent_changeset_free(data_reserved);
         return ret;
 
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 7b883239fa7e..5cd42b66818c 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3278,7 +3278,7 @@ static int relocate_file_extent_cluster(struct inode *inode,
                                 btrfs_delalloc_release_metadata(BTRFS_I(inode),
                                                         PAGE_SIZE, true);
                                 btrfs_delalloc_release_extents(BTRFS_I(inode),
-                                                        PAGE_SIZE, true);
+                                                        PAGE_SIZE);
                                 ret = -ENOMEM;
                                 goto out;
                         }
@@ -3299,7 +3299,7 @@ static int relocate_file_extent_cluster(struct inode *inode,
                                 btrfs_delalloc_release_metadata(BTRFS_I(inode),
                                                         PAGE_SIZE, true);
                                 btrfs_delalloc_release_extents(BTRFS_I(inode),
-                                                               PAGE_SIZE, true);
+                                                               PAGE_SIZE);
                                 ret = -EIO;
                                 goto out;
                         }
@@ -3328,7 +3328,7 @@ static int relocate_file_extent_cluster(struct inode *inode,
                         btrfs_delalloc_release_metadata(BTRFS_I(inode),
                                                          PAGE_SIZE, true);
                         btrfs_delalloc_release_extents(BTRFS_I(inode),
-                                                       PAGE_SIZE, true);
+                                                       PAGE_SIZE);
 
                         clear_extent_bits(&BTRFS_I(inode)->io_tree,
                                           page_start, page_end,
@@ -3344,8 +3344,7 @@ static int relocate_file_extent_cluster(struct inode *inode,
                 put_page(page);
 
                 index++;
-                btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE,
-                                               false);
+                btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);
                 balance_dirty_pages_ratelimited(inode->i_mapping);
                 btrfs_throttle(fs_info);
         }