diff options
| author | Wang Shilong <wangsl-fnst@cn.fujitsu.com> | 2013-04-11 07:08:55 +0000 |
|---|---|---|
| committer | Josef Bacik <jbacik@fusionio.com> | 2013-05-06 15:54:43 -0400 |
| commit | 692206b153ea0d08d6015521ed27a6739cbf6f9f (patch) | |
| tree | a37afdd2c3d0b159550865c3c78e338010031af8 | |
| parent | 1149ab6bd48cf3b00c59e4f8ff79fbb1cf15b94b (diff) | |
| download | linux-3.10-692206b153ea0d08d6015521ed27a6739cbf6f9f.tar.gz linux-3.10-692206b153ea0d08d6015521ed27a6739cbf6f9f.tar.bz2 linux-3.10-692206b153ea0d08d6015521ed27a6739cbf6f9f.zip | |
Btrfs: make __merge_refs() return type be void
__merge_refs() always return 0, it is unnecessary
for the caller to check the return value.
Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
| -rw-r--r-- | fs/btrfs/backref.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 66f44c7534d..7f448b8325a 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -443,7 +443,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 +489,6 @@ static int __merge_refs(struct list_head *head, int mode) } } - return 0; } /* @@ -884,18 +883,14 @@ again: if (ret) goto out; - 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); |