From ce7895938e31681d5d808fb53905dfda1f71e177 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Tue, 29 May 2012 21:47:38 -0500 Subject: [PATCH] --- yaml --- r: 320254 b: refs/heads/master c: 6384bb8b8e88a9c6bf2ae0d9517c2c0199177c34 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/ceph/messenger.h | 3 --- trunk/net/ceph/messenger.c | 5 ----- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index ae0f73aa9199..99fea4df0e7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5e372da9a469dfe3ece40277090a7056c566838 +refs/heads/master: 6384bb8b8e88a9c6bf2ae0d9517c2c0199177c34 diff --git a/trunk/include/linux/ceph/messenger.h b/trunk/include/linux/ceph/messenger.h index aa506cadea67..74f6c9bd8074 100644 --- a/trunk/include/linux/ceph/messenger.h +++ b/trunk/include/linux/ceph/messenger.h @@ -31,9 +31,6 @@ struct ceph_connection_operations { int (*verify_authorizer_reply) (struct ceph_connection *con, int len); int (*invalidate_authorizer)(struct ceph_connection *con); - /* protocol version mismatch */ - void (*bad_proto) (struct ceph_connection *con); - /* there was some error on the socket (disconnect, whatever) */ void (*fault) (struct ceph_connection *con); diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c index 42ca8aab6dcf..07af9948e3f7 100644 --- a/trunk/net/ceph/messenger.c +++ b/trunk/net/ceph/messenger.c @@ -1356,11 +1356,6 @@ static void fail_protocol(struct ceph_connection *con) { reset_connection(con); set_bit(CLOSED, &con->state); /* in case there's queued work */ - - mutex_unlock(&con->mutex); - if (con->ops->bad_proto) - con->ops->bad_proto(con); - mutex_lock(&con->mutex); } static int process_connect(struct ceph_connection *con)