Re: [PATCH 2/2] Btrfs: make some functions return type be void in backref.c
Hello, David Patch V2 has been sent out,many thanks for your review ^_^ Thanks, Wang On Wed, Apr 10, 2013 at 07:22:51PM +0800, Wang Shilong wrote: From: Wang Shilong wangsl-f...@cn.fujitsu.com __merge_refs() and __add_missing_keys() always return 0, it is unnecessary for the caller to check the return value. ok for __merge_refs, nak for __add_missing_keys: there's unhandled BUG_ON from read_tree_block 422 eb = read_tree_block(fs_info-tree_root, ref-wanted_disk_byte, 423 fs_info-tree_root-leafsize, 0); 424 BUG_ON(!eb); this should become a proper error handling someday and use the int return value. Keep the callers aware of that. david -- To unsubscribe from this list: send the line unsubscribe linux-btrfs in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line unsubscribe linux-btrfs in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/2] Btrfs: make some functions return type be void in backref.c
From: Wang Shilong wangsl-f...@cn.fujitsu.com
__merge_refs() and __add_missing_keys() always return 0, it is unnecessary
for the caller to check the return value.
Signed-off-by: Wang Shilong wangsl-f...@cn.fujitsu.com
---
fs/btrfs/backref.c | 18 +-
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index dc200f6..3521206 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -404,7 +404,7 @@ static inline int ref_for_same_block(struct __prelim_ref
*ref1,
/*
* read tree blocks and add keys where required.
*/
-static int __add_missing_keys(struct btrfs_fs_info *fs_info,
+static void __add_missing_keys(struct btrfs_fs_info *fs_info,
struct list_head *head)
{
struct list_head *pos;
@@ -430,7 +430,6 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info,
btrfs_tree_read_unlock(eb);
free_extent_buffer(eb);
}
- return 0;
}
/*
@@ -443,7 +442,7 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info,
* having a parent).
* mode = 2: merge identical parents
*/
-static int __merge_refs(struct list_head *head, int mode)
+static void __merge_refs(struct list_head *head, int mode)
{
struct list_head *pos1;
@@ -489,7 +488,6 @@ static int __merge_refs(struct list_head *head, int mode)
}
}
- return 0;
}
/*
@@ -880,22 +878,16 @@ again:
list_splice_init(prefs_delayed, prefs);
- ret = __add_missing_keys(fs_info, prefs);
- if (ret)
- goto out;
+ __add_missing_keys(fs_info, prefs);
- ret = __merge_refs(prefs, 1);
- if (ret)
- goto out;
+ __merge_refs(prefs, 1);
ret = __resolve_indirect_refs(fs_info, search_commit_root, time_seq,
prefs, extent_item_pos);
if (ret)
goto out;
- ret = __merge_refs(prefs, 2);
- if (ret)
- goto out;
+ __merge_refs(prefs, 2);
while (!list_empty(prefs)) {
ref = list_first_entry(prefs, struct __prelim_ref, list);
--
1.7.7.6
--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] Btrfs: make some functions return type be void in backref.c
On Wed, Apr 10, 2013 at 07:22:51PM +0800, Wang Shilong wrote: From: Wang Shilong wangsl-f...@cn.fujitsu.com __merge_refs() and __add_missing_keys() always return 0, it is unnecessary for the caller to check the return value. ok for __merge_refs, nak for __add_missing_keys: there's unhandled BUG_ON from read_tree_block 422 eb = read_tree_block(fs_info-tree_root, ref-wanted_disk_byte, 423 fs_info-tree_root-leafsize, 0); 424 BUG_ON(!eb); this should become a proper error handling someday and use the int return value. Keep the callers aware of that. david -- To unsubscribe from this list: send the line unsubscribe linux-btrfs in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
