[PATCH 1/4] ceph: make use of "else" where appropriate

[Alex Elder <elder@dreamhost.com>]

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: Alex Elder <elder@dreamhost.com>
---
  net/ceph/messenger.c |   11 ++++-------
  1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 068cb7e..c9a413a 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -247,7 +247,6 @@ static struct socket *ceph_tcp_connect(struct 
ceph_connection *con)
  			       IPPROTO_TCP, &sock);
  	if (ret)
  		return ERR_PTR(ret);
-	con->sock = sock;
  	sock->sk->sk_allocation = GFP_NOFS;

  #ifdef CONFIG_LOCKDEP
@@ -264,18 +263,16 @@ static struct socket *ceph_tcp_connect(struct 
ceph_connection *con)
  		dout("connect %s EINPROGRESS sk_state = %u\n",
  		     ceph_pr_addr(&con->peer_addr.in_addr),
  		     sock->sk->sk_state);
-		ret = 0;
-	}
-	if (ret < 0) {
+	} else if (ret < 0) {
  		pr_err("connect %s error %d\n",
  		       ceph_pr_addr(&con->peer_addr.in_addr), ret);
  		sock_release(sock);
-		con->sock = NULL;
  		con->error_msg = "connect error";
-	}

-	if (ret < 0)
  		return ERR_PTR(ret);
+	}
+	con->sock = sock;
+
  	return sock;
  }

-- 
1.7.5.4