From: Markus Elfring <[email protected]>
Date: Mon, 21 Aug 2017 15:45:23 +0200

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <[email protected]>
---

v2:
Do you find this refactoring acceptable instead?

 fs/btrfs/send.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 59fb1ed6ca20..527a9a735664 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -3697,20 +3697,20 @@ static int update_ref_path(struct send_ctx *sctx, 
struct recorded_ref *ref)
                return -ENOMEM;
 
        ret = get_cur_path(sctx, ref->dir, ref->dir_gen, new_path);
-       if (ret < 0) {
-               fs_path_free(new_path);
-               return ret;
-       }
+       if (ret < 0)
+               goto free_path;
+
        ret = fs_path_add(new_path, ref->name, ref->name_len);
-       if (ret < 0) {
-               fs_path_free(new_path);
-               return ret;
-       }
+       if (ret < 0)
+               goto free_path;
 
        fs_path_free(ref->full_path);
        set_ref_path(ref, new_path);
 
        return 0;
+free_path:
+       fs_path_free(new_path);
+       return ret;
 }
 
 /*
-- 
2.14.0

Reply via email to