* [PATCH 1/3] btrfs: remove fs_info argument from btrfs_block_rsv_add()
2026-09-30 15:47 [PATCH 0/3] btrfs: remove unused arguments and code in block-rsv.c fdmanana
@ 2026-09-30 15:47 ` fdmanana
2026-09-30 15:47 ` [PATCH 2/3] btrfs: remove fs_info argument from btrfs_block_rsv_refill() fdmanana
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: fdmanana @ 2026-09-30 15:47 UTC (permalink / raw)
To: linux-btrfs
From: Filipe Manana <fdmanana@suse.com>
The fs_info argument is not used, so remove it.
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
fs/btrfs/block-group.c | 5 ++---
fs/btrfs/block-rsv.c | 3 +--
fs/btrfs/block-rsv.h | 3 +--
fs/btrfs/delayed-inode.c | 3 +--
fs/btrfs/props.c | 3 +--
fs/btrfs/relocation.c | 2 +-
fs/btrfs/root-tree.c | 3 +--
fs/btrfs/transaction.c | 3 +--
8 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index c148b9d6e597..8ff21dde9a46 100644
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -4613,9 +4613,8 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,
if (ret && need_system_chunk)
return;
- ret = btrfs_block_rsv_add(fs_info,
- &fs_info->chunk_block_rsv,
- bytes, BTRFS_RESERVE_NO_FLUSH);
+ ret = btrfs_block_rsv_add(&fs_info->chunk_block_rsv, bytes,
+ BTRFS_RESERVE_NO_FLUSH);
if (!ret)
trans->chunk_bytes_reserved += bytes;
}
diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
index c68a8f4b7d19..ecbf66d6cc73 100644
--- a/fs/btrfs/block-rsv.c
+++ b/fs/btrfs/block-rsv.c
@@ -209,8 +209,7 @@ void btrfs_free_block_rsv(struct btrfs_fs_info *fs_info,
kfree(rsv);
}
-int btrfs_block_rsv_add(struct btrfs_fs_info *fs_info,
- struct btrfs_block_rsv *block_rsv, u64 num_bytes,
+int btrfs_block_rsv_add(struct btrfs_block_rsv *block_rsv, u64 num_bytes,
enum btrfs_reserve_flush_enum flush)
{
int ret;
diff --git a/fs/btrfs/block-rsv.h b/fs/btrfs/block-rsv.h
index 8359fb96bc3c..992272a01964 100644
--- a/fs/btrfs/block-rsv.h
+++ b/fs/btrfs/block-rsv.h
@@ -69,8 +69,7 @@ void btrfs_init_metadata_block_rsv(struct btrfs_fs_info *fs_info,
enum btrfs_rsv_type type);
void btrfs_free_block_rsv(struct btrfs_fs_info *fs_info,
struct btrfs_block_rsv *rsv);
-int btrfs_block_rsv_add(struct btrfs_fs_info *fs_info,
- struct btrfs_block_rsv *block_rsv, u64 num_bytes,
+int btrfs_block_rsv_add(struct btrfs_block_rsv *block_rsv, u64 num_bytes,
enum btrfs_reserve_flush_enum flush);
int btrfs_block_rsv_check(struct btrfs_block_rsv *block_rsv, int min_percent);
int btrfs_block_rsv_refill(struct btrfs_fs_info *fs_info,
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 1f20148c1fd4..333ce8b52489 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -600,8 +600,7 @@ static int btrfs_delayed_inode_reserve_metadata(
ret = btrfs_qgroup_reserve_meta_prealloc(root, num_bytes, true, true);
if (ret < 0)
return ret;
- ret = btrfs_block_rsv_add(fs_info, dst_rsv, num_bytes,
- BTRFS_RESERVE_NO_FLUSH);
+ ret = btrfs_block_rsv_add(dst_rsv, num_bytes, BTRFS_RESERVE_NO_FLUSH);
/* NO_FLUSH could only fail with -ENOSPC */
ASSERT(ret == 0 || ret == -ENOSPC);
if (ret)
diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index bb77d46376d4..7cc82366a1df 100644
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -440,8 +440,7 @@ int btrfs_inode_inherit_props(struct btrfs_trans_handle *trans,
*/
if (need_reserve) {
num_bytes = btrfs_calc_insert_metadata_size(fs_info, 1);
- ret = btrfs_block_rsv_add(fs_info, trans->block_rsv,
- num_bytes,
+ ret = btrfs_block_rsv_add(trans->block_rsv, num_bytes,
BTRFS_RESERVE_NO_FLUSH);
if (ret)
return ret;
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index da54db75e7a9..b7de08c7e9e2 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1795,7 +1795,7 @@ int prepare_to_merge(struct reloc_control *rc, int err)
again:
if (!err) {
num_bytes = rc->merging_rsv_size;
- ret = btrfs_block_rsv_add(fs_info, rc->block_rsv, num_bytes,
+ ret = btrfs_block_rsv_add(rc->block_rsv, num_bytes,
BTRFS_RESERVE_FLUSH_ALL);
if (ret)
err = ret;
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 2e4c3efbd02f..524210671ec4 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -510,8 +510,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
num_bytes = btrfs_calc_insert_metadata_size(fs_info, items);
rsv->space_info = btrfs_find_space_info(fs_info,
BTRFS_BLOCK_GROUP_METADATA);
- ret = btrfs_block_rsv_add(fs_info, rsv, num_bytes,
- BTRFS_RESERVE_FLUSH_ALL);
+ ret = btrfs_block_rsv_add(rsv, num_bytes, BTRFS_RESERVE_FLUSH_ALL);
if (ret == -ENOSPC && use_global_rsv)
ret = btrfs_block_rsv_migrate(global_rsv, rsv, num_bytes, true);
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index cc71ad8f5e82..da4ffa7bda00 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1767,8 +1767,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
btrfs_reloc_pre_snapshot(pending, &to_reserve);
if (to_reserve > 0) {
- pending->error = btrfs_block_rsv_add(fs_info,
- &pending->block_rsv,
+ pending->error = btrfs_block_rsv_add(&pending->block_rsv,
to_reserve,
BTRFS_RESERVE_NO_FLUSH);
if (unlikely(pending->error))
--
2.47.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] btrfs: remove fs_info argument from btrfs_block_rsv_refill()
2026-09-30 15:47 [PATCH 0/3] btrfs: remove unused arguments and code in block-rsv.c fdmanana
2026-09-30 15:47 ` [PATCH 1/3] btrfs: remove fs_info argument from btrfs_block_rsv_add() fdmanana
@ 2026-09-30 15:47 ` fdmanana
2026-09-30 15:47 ` [PATCH 3/3] btrfs: remove pointless qgroup assignment in block_rsv_release_bytes() fdmanana
2026-10-01 9:08 ` [PATCH 0/3] btrfs: remove unused arguments and code in block-rsv.c Qu Wenruo
3 siblings, 0 replies; 5+ messages in thread
From: fdmanana @ 2026-09-30 15:47 UTC (permalink / raw)
To: linux-btrfs
From: Filipe Manana <fdmanana@suse.com>
The fs_info argument is not used, so remove it.
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
fs/btrfs/block-rsv.c | 3 +--
fs/btrfs/block-rsv.h | 3 +--
fs/btrfs/inode.c | 4 ++--
fs/btrfs/relocation.c | 11 ++++-------
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
index ecbf66d6cc73..55e84ff0932e 100644
--- a/fs/btrfs/block-rsv.c
+++ b/fs/btrfs/block-rsv.c
@@ -238,8 +238,7 @@ int btrfs_block_rsv_check(struct btrfs_block_rsv *block_rsv, int min_percent)
return ret;
}
-int btrfs_block_rsv_refill(struct btrfs_fs_info *fs_info,
- struct btrfs_block_rsv *block_rsv, u64 num_bytes,
+int btrfs_block_rsv_refill(struct btrfs_block_rsv *block_rsv, u64 num_bytes,
enum btrfs_reserve_flush_enum flush)
{
int ret = -ENOSPC;
diff --git a/fs/btrfs/block-rsv.h b/fs/btrfs/block-rsv.h
index 992272a01964..39b8928e1559 100644
--- a/fs/btrfs/block-rsv.h
+++ b/fs/btrfs/block-rsv.h
@@ -72,8 +72,7 @@ void btrfs_free_block_rsv(struct btrfs_fs_info *fs_info,
int btrfs_block_rsv_add(struct btrfs_block_rsv *block_rsv, u64 num_bytes,
enum btrfs_reserve_flush_enum flush);
int btrfs_block_rsv_check(struct btrfs_block_rsv *block_rsv, int min_percent);
-int btrfs_block_rsv_refill(struct btrfs_fs_info *fs_info,
- struct btrfs_block_rsv *block_rsv, u64 num_bytes,
+int btrfs_block_rsv_refill(struct btrfs_block_rsv *block_rsv, u64 num_bytes,
enum btrfs_reserve_flush_enum 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/inode.c b/fs/btrfs/inode.c
index 2a32072849cb..343b6402bb35 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5595,10 +5595,10 @@ static struct btrfs_trans_handle *evict_refill_and_join(struct btrfs_root *root,
* if we fail to make this reservation we can re-try without the
* delayed_refs_extra so we can make some forward progress.
*/
- ret = btrfs_block_rsv_refill(fs_info, rsv, rsv->size + delayed_refs_extra,
+ ret = btrfs_block_rsv_refill(rsv, rsv->size + delayed_refs_extra,
BTRFS_RESERVE_FLUSH_EVICT);
if (ret) {
- ret = btrfs_block_rsv_refill(fs_info, rsv, rsv->size,
+ ret = btrfs_block_rsv_refill(rsv, rsv->size,
BTRFS_RESERVE_FLUSH_EVICT);
if (ret) {
btrfs_warn(fs_info,
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index b7de08c7e9e2..65cb9dcf0aac 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1675,8 +1675,7 @@ static noinline_for_stack int merge_reloc_root(struct reloc_control *rc,
memset(&next_key, 0, sizeof(next_key));
while (1) {
- ret = btrfs_block_rsv_refill(fs_info, rc->block_rsv,
- min_reserved,
+ ret = btrfs_block_rsv_refill(rc->block_rsv, min_reserved,
BTRFS_RESERVE_FLUSH_LIMIT);
if (ret)
goto out;
@@ -2274,7 +2273,7 @@ static int refill_metadata_space(struct btrfs_trans_handle *trans,
* If we get an enospc just kick back -EAGAIN so we know to drop the
* transaction and try to refill when we can flush all the things.
*/
- ret = btrfs_block_rsv_refill(fs_info, rc->block_rsv, num_bytes,
+ ret = btrfs_block_rsv_refill(rc->block_rsv, num_bytes,
BTRFS_RESERVE_FLUSH_LIMIT);
if (ret) {
u64 tmp = fs_info->nodesize * RELOCATION_RESERVED_NODES;
@@ -3584,8 +3583,7 @@ int prepare_to_relocate(struct reloc_control *rc)
rc->reserved_bytes = 0;
rc->block_rsv->size = rc->extent_root->fs_info->nodesize *
RELOCATION_RESERVED_NODES;
- ret = btrfs_block_rsv_refill(rc->extent_root->fs_info,
- rc->block_rsv, rc->block_rsv->size,
+ ret = btrfs_block_rsv_refill(rc->block_rsv, rc->block_rsv->size,
BTRFS_RESERVE_FLUSH_ALL);
if (ret)
return ret;
@@ -3637,8 +3635,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
while (1) {
rc->reserved_bytes = 0;
- ret = btrfs_block_rsv_refill(fs_info, rc->block_rsv,
- rc->block_rsv->size,
+ ret = btrfs_block_rsv_refill(rc->block_rsv, rc->block_rsv->size,
BTRFS_RESERVE_FLUSH_ALL);
if (ret) {
err = ret;
--
2.47.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] btrfs: remove pointless qgroup assignment in block_rsv_release_bytes()
2026-09-30 15:47 [PATCH 0/3] btrfs: remove unused arguments and code in block-rsv.c fdmanana
2026-09-30 15:47 ` [PATCH 1/3] btrfs: remove fs_info argument from btrfs_block_rsv_add() fdmanana
2026-09-30 15:47 ` [PATCH 2/3] btrfs: remove fs_info argument from btrfs_block_rsv_refill() fdmanana
@ 2026-09-30 15:47 ` fdmanana
2026-10-01 9:08 ` [PATCH 0/3] btrfs: remove unused arguments and code in block-rsv.c Qu Wenruo
3 siblings, 0 replies; 5+ messages in thread
From: fdmanana @ 2026-09-30 15:47 UTC (permalink / raw)
To: linux-btrfs
From: Filipe Manana <fdmanana@suse.com>
If num_bytes == (u64)-1, there's no point to set qgroup_to_release to
block_rsv->qgroup_rsv_size as later on we will overwrite that value
without ever reading the variable before that. So simplify things and
remove that assignment.
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
fs/btrfs/block-rsv.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
index 55e84ff0932e..fd604631b9ca 100644
--- a/fs/btrfs/block-rsv.c
+++ b/fs/btrfs/block-rsv.c
@@ -111,10 +111,8 @@ static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info,
u64 ret;
spin_lock(&block_rsv->lock);
- if (num_bytes == (u64)-1) {
+ if (num_bytes == (u64)-1)
num_bytes = block_rsv->size;
- qgroup_to_release = block_rsv->qgroup_rsv_size;
- }
block_rsv->size -= num_bytes;
if (block_rsv->reserved >= block_rsv->size) {
num_bytes = block_rsv->reserved - block_rsv->size;
@@ -128,8 +126,6 @@ static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info,
qgroup_to_release = block_rsv->qgroup_rsv_reserved -
block_rsv->qgroup_rsv_size;
block_rsv->qgroup_rsv_reserved = block_rsv->qgroup_rsv_size;
- } else {
- qgroup_to_release = 0;
}
spin_unlock(&block_rsv->lock);
--
2.47.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 0/3] btrfs: remove unused arguments and code in block-rsv.c
2026-09-30 15:47 [PATCH 0/3] btrfs: remove unused arguments and code in block-rsv.c fdmanana
` (2 preceding siblings ...)
2026-09-30 15:47 ` [PATCH 3/3] btrfs: remove pointless qgroup assignment in block_rsv_release_bytes() fdmanana
@ 2026-10-01 9:08 ` Qu Wenruo
3 siblings, 0 replies; 5+ messages in thread
From: Qu Wenruo @ 2026-10-01 9:08 UTC (permalink / raw)
To: fdmanana, linux-btrfs
在 2026/10/1 01:17, fdmanana@kernel.org 写道:
> From: Filipe Manana <fdmanana@suse.com>
>
> Remove unnecessary code and arguments from a few functions in block-rsv.c.
Reviewed-by: Qu Wenruo <wqu@suse.com>
Thanks,
Qu
>
> Filipe Manana (3):
> btrfs: remove fs_info argument from btrfs_block_rsv_add()
> btrfs: remove fs_info argument from btrfs_block_rsv_refill()
> btrfs: remove pointless qgroup assignment in block_rsv_release_bytes()
>
> fs/btrfs/block-group.c | 5 ++---
> fs/btrfs/block-rsv.c | 12 +++---------
> fs/btrfs/block-rsv.h | 6 ++----
> fs/btrfs/delayed-inode.c | 3 +--
> fs/btrfs/inode.c | 4 ++--
> fs/btrfs/props.c | 3 +--
> fs/btrfs/relocation.c | 13 +++++--------
> fs/btrfs/root-tree.c | 3 +--
> fs/btrfs/transaction.c | 3 +--
> 9 files changed, 18 insertions(+), 34 deletions(-)
>
^ permalink raw reply [flat|nested] 5+ messages in thread