Skip to contentSkip to conversation

btrfs: Make btrfs_finish_extent_commit() return void

PATCH In review Qu Wenruo 3 participants 3 messages Apr 16, 2019 – Apr 24, 2019 Btrfs file system

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH 1/1 btrfs: Make btrfs_finish_extent_commit() return void

This function always return 0, and the only use case of @ret is to output warning message for discard failure, which doesn't cause anything wrong to the fs even discarding failed.

There is no need to make it return int.

---
 fs/btrfs/ctree.h       | 2 +-
 fs/btrfs/extent-tree.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
fs/btrfs/ctree.h +1 -1
index b3642367a595..129f7520dc5f 100644
@@ -2758,7 +2758,7 @@ int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
 int btrfs_free_and_pin_reserved_extent(struct btrfs_fs_info *fs_info,
 				       u64 start, u64 len);
 void btrfs_prepare_extent_commit(struct btrfs_fs_info *fs_info);
-int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);
+void btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);
 int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
 			 struct btrfs_root *root,
 			 u64 bytenr, u64 num_bytes, u64 parent,
fs/btrfs/extent-tree.c +1 -3
index c5880329ae37..87a963d819c3 100644
@@ -6907,7 +6907,7 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info,
 	return 0;
 }
 
-int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
+void btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
 {
 	struct btrfs_fs_info *fs_info = trans->fs_info;
 	struct btrfs_block_group_cache *block_group, *tmp;
@@ -6971,8 +6971,6 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
 				   ret, errstr);
 		}
 	}
-
-	return 0;
 }
 
 static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
Signature · 1 line
2.21.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Qu Wenruo

This function always return 0, and the only use case of @ret is to output warning message for discard failure, which doesn't cause anything wrong to the fs even discarding failed.

There is no need to make it return int.

Quoted 41 lines
---
 fs/btrfs/ctree.h       | 2 +-
 fs/btrfs/extent-tree.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
fs/btrfs/ctree.h +1 -1
index b3642367a595..129f7520dc5f 100644
@@ -2758,7 +2758,7 @@ int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
 int btrfs_free_and_pin_reserved_extent(struct btrfs_fs_info *fs_info,
 				       u64 start, u64 len);
 void btrfs_prepare_extent_commit(struct btrfs_fs_info *fs_info);
-int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);
+void btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);
 int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
 			 struct btrfs_root *root,
 			 u64 bytenr, u64 num_bytes, u64 parent,
fs/btrfs/extent-tree.c +1 -3
index c5880329ae37..87a963d819c3 100644
@@ -6907,7 +6907,7 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info,
 	return 0;
 }
 
-int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
+void btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
 {
 	struct btrfs_fs_info *fs_info = trans->fs_info;
 	struct btrfs_block_group_cache *block_group, *tmp;
@@ -6971,8 +6971,6 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
 				   ret, errstr);
 		}
 	}
-
-	return 0;
 }
 
 static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
#2 lore raw
In reply to Qu Wenruo
Quoted 5 lines · Qu Wenruo

This function always return 0, and the only use case of @ret is to output warning message for discard failure, which doesn't cause anything wrong to the fs even discarding failed.

There is no need to make it return int.

Same comment as https://patchwork.kernel.org/patch/10901977/ , check the whole callgraph of the function before making it return void.