mptcp: userspace pm rename remove_err to out
authorGeliang Tang <geliang.tang@suse.com>
Tue, 28 Nov 2023 23:18:50 +0000 (15:18 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 30 Nov 2023 04:06:17 +0000 (20:06 -0800)
The value of 'err' will not be only '-EINVAL', but can be '0' in some
cases.

So it's better to rename the label 'remove_err' to 'out' to avoid
confusions.

Suggested-by: Matthieu Baerts <matttbe@kernel.org>
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231128-send-net-next-2023107-v4-6-8d6b94150f6b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/mptcp/pm_userspace.c

index 5c01b9bc619a8f6639406c81bb2acc8555800c44..efecbe3cf41533324a5df71da39f775dd2078ca6 100644 (file)
@@ -276,12 +276,12 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)
 
        if (!mptcp_pm_is_userspace(msk)) {
                GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");
-               goto remove_err;
+               goto out;
        }
 
        if (id_val == 0) {
                err = mptcp_userspace_pm_remove_id_zero_address(msk, info);
-               goto remove_err;
+               goto out;
        }
 
        lock_sock(sk);
@@ -296,7 +296,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)
        if (!match) {
                GENL_SET_ERR_MSG(info, "address with specified id not found");
                release_sock(sk);
-               goto remove_err;
+               goto out;
        }
 
        list_move(&match->list, &free_list);
@@ -310,7 +310,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)
        }
 
        err = 0;
- remove_err:
+out:
        sock_put(sk);
        return err;
 }