From 8795241d460cb7457dcb8b3d3b78a4d0e5343500 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Wed, 16 May 2012 15:16:38 -0500 Subject: [PATCH] --- yaml --- r: 309464 b: refs/heads/master c: e10c758e4031a801ea4d2f8fb39bf14c2658d74b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ceph/messenger.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a08fa6311471..c99a410e9541 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e825a66df97776d30a48a187e3a986736af43945 +refs/heads/master: e10c758e4031a801ea4d2f8fb39bf14c2658d74b diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c index 47499dc0e413..cf292939dd1e 100644 --- a/trunk/net/ceph/messenger.c +++ b/trunk/net/ceph/messenger.c @@ -697,6 +697,7 @@ static int prepare_write_connect(struct ceph_connection *con) { unsigned global_seq = get_global_seq(con->msgr, 0); int proto; + int ret; switch (con->peer_name.type) { case CEPH_ENTITY_TYPE_MON: @@ -723,11 +724,14 @@ static int prepare_write_connect(struct ceph_connection *con) con->out_connect.flags = 0; ceph_con_out_kvec_add(con, sizeof (con->out_connect), &con->out_connect); + ret = prepare_connect_authorizer(con); + if (ret) + return ret; con->out_more = 0; set_bit(WRITE_PENDING, &con->state); - return prepare_connect_authorizer(con); + return 0; } /*