[PATCH 51/51] sctp: remove the out_nounlock label in sctp_setsockopt

[Christoph Hellwig]

This is just used once, and a direct return for the redirect to the AF
case is much easier to follow than jumping to the end of a very long
function.

Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 net/sctp/socket.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index f2d4f8a0c426bb..9a767f35971865 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4444,8 +4444,8 @@ static int sctp_setsockopt(struct sock *sk, int level, 
int optname,
         */
        if (level != SOL_SCTP) {
                struct sctp_af *af = sctp_sk(sk)->pf->af;
-               retval = af->setsockopt(sk, level, optname, optval, optlen);
-               goto out_nounlock;
+
+               return af->setsockopt(sk, level, optname, optval, optlen);
        }
 
        if (optlen > 0) {
@@ -4635,8 +4635,6 @@ static int sctp_setsockopt(struct sock *sk, int level, 
int optname,
 
        release_sock(sk);
        kfree(kopt);
-
-out_nounlock:
        return retval;
 }
 
-- 
2.27.0