Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5bc3129 authored by Alex Elder's avatar Alex Elder
Browse files

ceph: make use of "else" where appropriate 



Rearrange ceph_tcp_connect() a bit, making use of "else" rather than
re-testing a value with consecutive "if" statements.  Don't record a
connection's socket pointer unless the connect operation is
successful.

Signed-off-by: default avatarAlex Elder <elder@dreamhost.com>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 57666519

net/ceph/messenger.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -251,7 +251,6 @@ static struct socket *ceph_tcp_connect(struct ceph_connection *con) 
			       IPPROTO_TCP, &sock);

			       IPPROTO_TCP, &sock);

	if (ret)

	if (ret)

		return ERR_PTR(ret);

		return ERR_PTR(ret);

	con->sock = sock;

	sock->sk->sk_allocation = GFP_NOFS;

	sock->sk->sk_allocation = GFP_NOFS;





#ifdef CONFIG_LOCKDEP

#ifdef CONFIG_LOCKDEP
@@ -268,18 +267,16 @@ static struct socket *ceph_tcp_connect(struct ceph_connection *con) 
		dout("connect %s EINPROGRESS sk_state = %u\n",

		dout("connect %s EINPROGRESS sk_state = %u\n",

		     ceph_pr_addr(&con->peer_addr.in_addr),

		     ceph_pr_addr(&con->peer_addr.in_addr),

		     sock->sk->sk_state);

		     sock->sk->sk_state);

		ret = 0;

	} else if (ret < 0) {

	}

	if (ret < 0) {

		pr_err("connect %s error %d\n",

		pr_err("connect %s error %d\n",

		       ceph_pr_addr(&con->peer_addr.in_addr), ret);

		       ceph_pr_addr(&con->peer_addr.in_addr), ret);

		sock_release(sock);

		sock_release(sock);

		con->sock = NULL;

		con->error_msg = "connect error";

		con->error_msg = "connect error";

	}





	if (ret < 0)

		return ERR_PTR(ret);

		return ERR_PTR(ret);

	}

	con->sock = sock;



	return sock;

	return sock;

}

}