sctp: remove the out_nounlock label in sctp_setsockopt (6c8983a6) · Commits · 戴 / test

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 <hch@lst.de> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/sctp/socket.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message